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

fixed racing in stretched hyperbolic

This commit is contained in:
Zeno Rogue 2019-10-05 13:59:27 +02:00
parent eead4af644
commit afa65ee525
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
racing.cpp
View File

@ -285,7 +285,7 @@ void find_track(cell *start, int sign, int len) {
case 4: id = start->master->emeraldval - c1->master->emeraldval; break; case 4: id = start->master->emeraldval - c1->master->emeraldval; break;
} }
} }
else if(sol) else if(solnih)
id = (start->master->distance - c1->master->distance) * sign; id = (start->master->distance - c1->master->distance) * sign;
else else
id = trackval(c1); id = trackval(c1);
@ -295,7 +295,7 @@ void find_track(cell *start, int sign, int len) {
if(euclid && (penrose || archimedean)) permanent_long_distances(goal); if(euclid && (penrose || archimedean)) permanent_long_distances(goal);
if(sol || nil || sl2) { if(solnih || nil || sl2) {
vector<cell*> p; vector<cell*> p;
while(goal != start) p.push_back(goal), goal = parent[goal]; while(goal != start) p.push_back(goal), goal = parent[goal];
while(!p.empty()) track.push_back(p.back()), p.pop_back(); while(!p.empty()) track.push_back(p.back()), p.pop_back();
@ -441,6 +441,11 @@ EX void generate_track() {
find_track(track.back(), -1, LENGTH-2*(LENGTH/4)); find_track(track.back(), -1, LENGTH-2*(LENGTH/4));
find_track(track.back(), 1, LENGTH/4); find_track(track.back(), 1, LENGTH/4);
} }
else if(nih) {
track.push_back(s);
find_track(s, 1, LENGTH/2);
find_track(track.back(), -1, LENGTH/2);
}
else if(nil) { else if(nil) {
track.push_back(s); track.push_back(s);
find_track(s, 1, LENGTH/4); find_track(s, 1, LENGTH/4);
@ -695,7 +700,7 @@ bool inrec = false;
EX ld race_angle = 90; EX ld race_angle = 90;
EX bool force_standard_centering() { EX bool force_standard_centering() {
return sol || nil || hybri || quotient || bounded; return solnih || nil || hybri || quotient || bounded;
} }
EX bool use_standard_centering() { EX bool use_standard_centering() {