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

rulegen:: improved overzealous xsidefreeze detection

Browse Source
This commit is contained in:
Zeno Rogue 2021-12-25 21:32:34 +01:00
parent 71fd8eccf5
commit 22ffb60ec3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rulegen.cpp
View File

@ -848,6 +848,8 @@ void trace_root_path(vector<int>& rp, twalker cw) {
if(flags & w_parent_reverse) reverse(rp.begin(), rp.end()); if(flags & w_parent_reverse) reverse(rp.begin(), rp.end());
} }
EX int parent_updates;
/** which neighbor will become the parent of c */ /** which neighbor will become the parent of c */
EX twalker get_parent_dir(twalker& cw) { EX twalker get_parent_dir(twalker& cw) {
@ -1141,7 +1143,8 @@ int get_side(twalker what) {
handle_distance_errors(); handle_distance_errors();
steps++; if(steps > max_getside) { steps++; if(steps > max_getside) {
debuglist = {what, to_what, wl, wr}; debuglist = {what, to_what, wl, wr};
throw rulegen_failure("xsidefreeze"); if(parent_updates) throw rulegen_retry("xsidefreeze");
else throw rulegen_failure("xsidefreeze");
} }
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;
@ -1695,6 +1698,7 @@ EX void rules_iteration() {
while(c) { c->code = MYSTERY; c = c->next; } while(c) { c->code = MYSTERY; c = c->next; }
clear_codes(); clear_codes();
parent_updates = 0;
cq = important; cq = important;