mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-29 19:40:35 +00:00
Code Issues Releases Wiki Activity

rulegen:: fixed some bugs with sidecache

Browse Source
This commit is contained in:
Zeno Rogue 2022-02-01 16:57:34 +01:00
parent afb3a2be59
commit bff37f0274
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rulegen.cpp
View File

@ -1217,10 +1217,11 @@ int get_side(twalker what) {
bool gl = wl.at->dist <= wr.at->dist; bool gl = wl.at->dist <= wr.at->dist;
bool gr = wl.at->dist >= wr.at->dist; bool gr = wl.at->dist >= wr.at->dist;
if(gl) { if(gl) {
if(get_sidecache(wl) == 1) wl += wstep; if(side && get_sidecache(wl) == 1) wl += wstep;
treewalk(wl, -1); treewalk(wl, -1);
if(wl == to_what) { res = 1; } if(wl == to_what) { res = 1; }
if(lstack.back() == wl+wstep) { if(!side) ;
else if(lstack.back() == wl+wstep) {
set_sidecache(lstack.back(), 1); set_sidecache(lstack.back(), 1);
set_sidecache(wl, -1); set_sidecache(wl, -1);
lstack.pop_back(); lstack.pop_back();
@ -1228,10 +1229,11 @@ int get_side(twalker what) {
else if(wl.at->parent_dir != wl.spin && (wl+wstep).at->parent_dir != (wl+wstep).spin) lstack.push_back(wl); else if(wl.at->parent_dir != wl.spin && (wl+wstep).at->parent_dir != (wl+wstep).spin) lstack.push_back(wl);
} }
if(gr) { if(gr) {
if(get_sidecache(wr) == -1) wr += wstep; if(side && get_sidecache(wr) == -1) wr += wstep;
treewalk(wr, +1); treewalk(wr, +1);
if(wr == to_what) {res = -1; } if(wr == to_what) {res = -1; }
if(rstack.back() == wr+wstep) { if(!side) ;
else if(rstack.back() == wr+wstep) {
set_sidecache(rstack.back(), -1); set_sidecache(rstack.back(), -1);
set_sidecache(wr, +1); set_sidecache(wr, +1);
rstack.pop_back(); rstack.pop_back();
@ -2035,6 +2037,7 @@ EX void generate_rules() {
cell_to_tcell.clear(); cell_to_tcell.clear();
tcell_to_cell.clear(); tcell_to_cell.clear();
branch_conflicts_seen.clear(); branch_conflicts_seen.clear();
sidecaches_to_clear.clear();
clear_sidecache_and_codes(); clear_sidecache_and_codes();
fix_queue = queue<reaction_t>();; in_fixing = false; fix_queue = queue<reaction_t>();; in_fixing = false;