mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

some arrays had number bounds while it should have been MAX_EDGE

This commit is contained in:
Zeno Rogue 2018-08-18 17:37:12 +02:00
parent a92cc33426
commit 1a6427ba32
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
floorshapes.cpp
View File

@ -39,7 +39,7 @@ hyperpoint adist(ld a, ld x) {
return spin(a) * xpush(x) * C0; return spin(a) * xpush(x) * C0;
} }
typedef pair<transmatrix, array<transmatrix, 8>> matrixitem; typedef pair<transmatrix, array<transmatrix, MAX_EDGE>> matrixitem;
struct mesher { struct mesher {
eGeometry g; eGeometry g;

10
game.cpp
View File

@ -3850,7 +3850,7 @@ void determinizeBull(cell *c, int *posdir, int& nc) {
// determinize the Angry Beast movement: // determinize the Angry Beast movement:
// use the previous PC's positions as the tiebreaker // use the previous PC's positions as the tiebreaker
for(int k=0; k<SHSIZE && nc>1; k++) { for(int k=0; k<SHSIZE && nc>1; k++) {
int pts[10]; int pts[MAX_EDGE];
for(int d=0; d<nc; d++) pts[d] = totalbulldistance(c->move(posdir[d]), k); for(int d=0; d<nc; d++) pts[d] = totalbulldistance(c->move(posdir[d]), k);
int bestpts = 1000; int bestpts = 1000;
@ -3875,7 +3875,7 @@ int determinizeBullPush(cellwalker bull) {
return 1; return 1;
} }
int posdir[10], nc; int posdir[MAX_EDGE], nc;
int pickMoveDirection(cell *c, flagtype mf) { int pickMoveDirection(cell *c, flagtype mf) {
int bestval = stayval(c, mf); int bestval = stayval(c, mf);
@ -3898,7 +3898,7 @@ int pickMoveDirection(cell *c, flagtype mf) {
} }
int pickDownDirection(cell *c, flagtype mf) { int pickDownDirection(cell *c, flagtype mf) {
int downs[10], qdowns = 0; int downs[MAX_EDGE], qdowns = 0;
int bestdif = -100; int bestdif = -100;
forCellIdEx(c2, i, c) { forCellIdEx(c2, i, c) {
if(gravityLevel(c2) < gravityLevel(c) && passable_for(c->monst, c2, c, P_MIRROR) && if(gravityLevel(c2) < gravityLevel(c) && passable_for(c->monst, c2, c, P_MIRROR) &&
@ -4609,7 +4609,7 @@ void groupmove(eMonster movtype, flagtype mf) {
for(int i=0; i<isize(gendfs); i++) { for(int i=0; i<isize(gendfs); i++) {
cell *c = gendfs[i]; cell *c = gendfs[i];
int dirtable[10], qdirtable=0; int dirtable[MAX_EDGE], qdirtable=0;
forCellIdAll(c2,t,c) dirtable[qdirtable++] = t; forCellIdAll(c2,t,c) dirtable[qdirtable++] = t;
hrandom_shuffle(dirtable, qdirtable); hrandom_shuffle(dirtable, qdirtable);
@ -4741,7 +4741,7 @@ void movehex(bool mounted, int colorpair) {
for(int i=0; i<isize(hexdfs); i++) { for(int i=0; i<isize(hexdfs); i++) {
cell *c = hexdfs[i]; cell *c = hexdfs[i];
int dirtable[10], qdirtable=0; int dirtable[MAX_EDGE], qdirtable=0;
for(int t=0; t<c->type; t++) if(c->move(t) && inpair(c->move(t), colorpair)) for(int t=0; t<c->type; t++) if(c->move(t) && inpair(c->move(t), colorpair))
dirtable[qdirtable++] = t; dirtable[qdirtable++] = t;

2
netgen.cpp
View File

@ -58,7 +58,7 @@ namespace hr { namespace netgen {
char patek[MAXCELLS][MAX_EDGE]; char patek[MAXCELLS][MAX_EDGE];
// data generated by HyperRogue // data generated by HyperRogue
hyperpoint hcenter[MAXCELLS][9]; hyperpoint hcenter[MAXCELLS][MAX_EDGE+1];
// Functions handling the data. // Functions handling the data.
//============================== //==============================