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

binary:: celldistance3_approx works without cells too

This commit is contained in:
Zeno Rogue 2019-08-03 11:34:24 +02:00
parent d6d613687b
commit 5d7ea94246
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binary-tiling.cpp
View File

@ -819,8 +819,13 @@ int celldistance3_approx(heptagon *c1, heptagon *c2) {
while(true) {
if(d > 1000000) return d; /* sanity check */
if(c1 == c2) return d;
if(neighborId(c1->c7, c2->c7) >= 0) return d + 1;
forCellEx(c3, c1->c7) if(neighborId(c3, c2->c7) >= 0) return d + 2;
for(int i=0; i<c1->type; i++)
if(c1->move(i) == c2) return d + 1;
for(int i=0; i<c1->type; i++) {
heptagon *c3 = c1->move(i);
for(int j=0; j<c3->type; j++)
if(c3->move(j) == c2) return d+2;
}
if(c1->distance > c2->distance) c1=c1->cmove(updir()), d++;
else c2=c2->cmove(updir()), d++;
}