mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-03-11 22:18:16 +00:00
Code Issues Releases Wiki Activity

fixed a bug in celldistance_534

Browse Source
This commit is contained in:
Zeno Rogue 2024-05-08 21:17:20 +02:00
parent 0b0ad4abe3
commit 000bfd4b97
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
reg3.cpp
View File

@ -2585,13 +2585,13 @@ int celldistance_534(cell *c1, cell *c2) {
vector<cell*> s1 = {c1}; vector<cell*> s1 = {c1};
vector<cell*> s2 = {c2}; vector<cell*> s2 = {c2};
int best = DISTANCE_UNKNOWN; int best = DISTANCE_UNKNOWN_BIG;
int d0 = 0; int d0 = 0;
auto go_nearer = [&] (vector<cell*>& v, int& d) { auto go_nearer = [&] (vector<cell*>& v, int& d) {
vector<cell*> w; vector<cell*> w;
for(cell *c: v) for(cell *c: v)
forCellEx(c1, c) forCellCM(c1, c)
if(celldist(c1) < d) if(celldist(c1) < d)
w.push_back(c1); w.push_back(c1);
sort(w.begin(), w.end()); sort(w.begin(), w.end());
@ -2601,7 +2601,7 @@ int celldistance_534(cell *c1, cell *c2) {
v = w; v = w;
}; };
while(d0 < best) { while(d0 < best) {
for(cell *a1: s1) for(cell *a2: s2) { for(cell *a1: s1) for(cell *a2: s2) {
if(a1 == a2) best = min(best, d0); if(a1 == a2) best = min(best, d0);
else if(isNeighbor(a1, a2)) best = min(best, d0+1); else if(isNeighbor(a1, a2)) best = min(best, d0+1);
@ -2612,6 +2612,7 @@ int celldistance_534(cell *c1, cell *c2) {
if(d1 >= d2) go_nearer(s1, d1); if(d1 >= d2) go_nearer(s1, d1);
if(d1 < d2) go_nearer(s2, d2); if(d1 < d2) go_nearer(s2, d2);
} }
if(best == DISTANCE_UNKNOWN_BIG) best = DISTANCE_UNKNOWN; /* just in case */
return best; return best;
} }