From 162edb85a8f9d606e631bd1183bf24704ac8792e Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 26 Feb 2022 11:28:37 +0100
Subject: [PATCH] when having Orb of Freedom + Orb of Time, other orbs are no
 longer drained by Freedom checks

---
 multigame.cpp | 5 ++---
 orbs.cpp      | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/multigame.cpp b/multigame.cpp
index 2fc692ce..129e0710 100644
--- a/multigame.cpp
+++ b/multigame.cpp
@@ -179,8 +179,7 @@ EX namespace dual {
     dynamicval<int> dm(dual::state, 2);
     int cg = currently_loaded;
       
-    bool orbusedbak[ittypes];
-    for(int i=0; i<ittypes; i++) orbusedbak[i] = orbused[i];
+    auto orbusedbak = orbused;
 
     if(d < 0) {
       if(d == -2 && items[itGreenStone] < 2) {
@@ -193,7 +192,7 @@ EX namespace dual {
       for(int k=0; k<2; k++) {
         switch_to(k);
         ok = ok && movepcto(d, subdir, true);
-        for(int i=0; i<ittypes; i++) orbused[i] = orbusedbak[i];
+        orbused = orbusedbak;
         }
       if(ok && checkonly) {
         switch_to(cg);
diff --git a/orbs.cpp b/orbs.cpp
index df0a4714..8a3b5843 100644
--- a/orbs.cpp
+++ b/orbs.cpp
@@ -8,7 +8,8 @@
 #include "hyper.h"
 namespace hr {
 
-EX bool orbused[ittypes], lastorbused[ittypes];
+EX array<bool, ittypes> orbused;
+EX array<bool, ittypes> lastorbused;
 
 EX bool markOrb(eItem it) {
   if(!items[it]) return false;
@@ -314,6 +315,7 @@ EX bool distanceBound(cell *c1, cell *c2, int d) {
 
 EX void checkFreedom(cell *cf) {
   manual_celllister cl;
+  dynamicval<decltype(orbused)> d(orbused);
   cl.add(cf);
   for(int i=0; i<isize(cl.lst); i++) {
     cell *c = cl.lst[i];