From 466cc5cc0a884c560d20ca7d15032570d7139020 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 9 Sep 2022 12:24:21 +0200
Subject: [PATCH] removed redundant pre-changes orbused rollback, and made it
 more elegant in movegolem

---
 checkmove.cpp   | 8 --------
 graph.cpp       | 3 ---
 monstermove.cpp | 5 ++---
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/checkmove.cpp b/checkmove.cpp
index 6843b619..eb2b6a92 100644
--- a/checkmove.cpp
+++ b/checkmove.cpp
@@ -200,8 +200,6 @@ EX bool monstersnear_aux() {
   changes.value_set(passive_switch, (gold() & 1) ? moSwitch1 : moSwitch2);
   multi::cpid++;
   bool b = false;
-  bool recorduse[ittypes];
-  for(int i=0; i<ittypes; i++) recorduse[i] = orbused[i];
   if(multi::cpid == multi::players || multi::players == 1 || multi::checkonly) {
 
     if(shmup::delayed_safety) return false;
@@ -235,7 +233,6 @@ EX bool monstersnear_aux() {
     }
   else b = !multimove();
   multi::cpid--;
-  for(int i=0; i<ittypes; i++) orbused[i] = recorduse[i];
   return b;
   }
 
@@ -296,11 +293,7 @@ EX void checkmove() {
 
   if(multi::players > 1 && !multi::checkonly) return;
   if(hardcore) return;
-  bool orbusedbak[ittypes];
   
-  // do not activate orbs!
-  for(int i=0; i<ittypes; i++) orbusedbak[i] = orbused[i];
-
   legalmoves.clear(); legalmoves.resize(cwt.at->type+1, false);
   move_issues.clear(); move_issues.resize(cwt.at->type, 0);
 
@@ -356,7 +349,6 @@ EX void checkmove() {
     }
   items[itWarning]-=2;
 
-  for(int i=0; i<ittypes; i++) orbused[i] = orbusedbak[i];
   if(recallCell.at && !markOrb(itOrbRecall)) activateRecall();  
   }
 
diff --git a/graph.cpp b/graph.cpp
index 5f33f3b8..9c566854 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -5115,10 +5115,7 @@ EX void drawthemap() {
     cellwalker cw = cwt; bool f = flipplayer;
     items[itWarning]+=2;
     
-    bool recorduse[ittypes];
-    for(int i=0; i<ittypes; i++) recorduse[i] = orbused[i];
     movepcto(mousedest.d, mousedest.subdir, true);
-    for(int i=0; i<ittypes; i++) orbused[i] = recorduse[i];
     items[itWarning] -= 2;
     if(cw.spin != cwt.spin) mirror::act(-mousedest.d, mirror::SPINSINGLE);
     cwt = cw; flipplayer = f;
diff --git a/monstermove.cpp b/monstermove.cpp
index 57b8b658..d6b2e6c4 100644
--- a/monstermove.cpp
+++ b/monstermove.cpp
@@ -1686,8 +1686,7 @@ EX void movegolems(flagtype flags) {
       if(m == moGolem) qg++;
       if(m == moFriendlyGhost) markOrb(itOrbUndeath);
 
-      bool recorduse[ittypes];
-      for(int i=0; i<ittypes; i++) recorduse[i] = orbused[i];
+      auto recorduse = orbused;
 
       DEBB(DF_TURN, ("stayval"));
       int bestv = stayvalue(m, c);
@@ -1711,7 +1710,7 @@ EX void movegolems(flagtype flags) {
           }
         }
 
-      for(int i=0; i<ittypes; i++) orbused[i] = recorduse[i];
+      orbused = recorduse;
       
 //    printf("stayvalue = %d, result = %d, bq = %d\n", stayvalue(m,c), bestv, bq);