mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-05 11:57:58 +00:00
Code Issues Releases Wiki Activity

fixed clearing crashing in octagonal mode, and hopefully improved it in general

Browse Source
This commit is contained in:
Zeno Rogue
2025-08-19 01:05:27 +02:00
parent f5f21ae95b
commit 76176c9150
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
complex.cpp
View File

@@ -843,6 +843,15 @@ EX namespace clearing {
} }
} }
bool goes_below(cell *c, int d, int steps) {
if(pseudohept(c)) return false;
if(celldistAlt(c) < d) return true;
if(celldistAlt(c) > d) return false;
if(steps == 0) return false;
forCellIdCM(c2, i, c) if(goes_below(c2, d, steps-1)) return true;
return false;
}
int plantdir(cell *c) { int plantdir(cell *c) {
if(have_alt(c)) if(have_alt(c))
gen_alt_around(c); gen_alt_around(c);
@@ -888,8 +897,12 @@ EX namespace clearing {
if((d & 7) < 4) i = (i+2) % c->type; if((d & 7) < 4) i = (i+2) % c->type;
return i; return i;
} }
printf("error in plantdir\n"); for(int steps=0; steps<60; steps++)
return 1; forCellIdCM(c2, i2, c)
if(goes_below(c2, d, steps))
return i2;
println(hlog, "error in plantdir, quseful = ", quseful);
return -1;
} }
vector<cell*> onpath; vector<cell*> onpath;
@@ -957,6 +970,7 @@ EX namespace clearing {
steps++; steps++;
onpath.push_back(c); pdir.push_back(d); onpath.push_back(c); pdir.push_back(d);
// printf("c [%4d] %p -> %p\n", celldistAlt(c), c, c->move(d)); // printf("c [%4d] %p -> %p\n", celldistAlt(c), c, c->move(d));
if(d == -1) break;
c = c->move(d); c = c->move(d);
} }
else { else {