mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

in_underlying_map, not PIU in distance functions

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-18 16:58:20 +02:00
parent f40072511b
commit 081bb55202
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cell.cpp
View File

@ -448,7 +448,11 @@ EX int compdist(int dx[]) {
EX int celldist(cell *c) { EX int celldist(cell *c) {
if(experimental) return 0; if(experimental) return 0;
if(prod) { auto w = product::get_where(c); return PIU(celldist(w.first)) + abs(w.second); } if(prod) { auto w = product::get_where(c);
int d;
product::in_underlying_map([&] { d = celldist(w.first) + abs(w.second); });
return d;
}
if(fulltorus && WDIM == 2) if(fulltorus && WDIM == 2)
return torusmap()->dists[decodeId(c->master)]; return torusmap()->dists[decodeId(c->master)];
if(nil) return DISTANCE_UNKNOWN; if(nil) return DISTANCE_UNKNOWN;
@ -479,7 +483,11 @@ static const int ALTDIST_ERROR = 90000;
EX int celldistAlt(cell *c) { EX int celldistAlt(cell *c) {
if(experimental) return 0; if(experimental) return 0;
if(prod) { auto w = product::get_where(c); return PIU(celldistAlt(w.first)) + abs(w.second); } if(prod) { auto w = product::get_where(c);
int d = 0;
product::in_underlying_map([&] { d = celldistAlt(w.first) + abs(w.second); });
return d;
}
if(masterless) { if(masterless) {
if(fulltorus) return celldist(c); if(fulltorus) return celldist(c);
if(euwrap) return cylinder_alt(c); if(euwrap) return cylinder_alt(c);
@ -984,7 +992,11 @@ EX cell *random_in_distance(cell *c, int d) {
EX int celldistance(cell *c1, cell *c2) { EX int celldistance(cell *c1, cell *c2) {
if(prod) { auto w1 = product::get_where(c1), w2 = product::get_where(c2); return PIU(celldistance(w1.first, w2.first) + abs(w1.second - w2.second)); } if(prod) { auto w1 = product::get_where(c1), w2 = product::get_where(c2);
int d;
product::in_underlying_map([&] { d = celldistance(w1.first, w2.first) + abs(w1.second - w2.second); });
return d;
}
if((masterless) && (euclid6 || (euclid4 && PURE))) { if((masterless) && (euclid6 || (euclid4 && PURE))) {
if(!euwrap) if(!euwrap)