From f98448464ae967bc242418e0934f59bc9ce9d879 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 28 Apr 2019 12:09:57 +0200
Subject: [PATCH] renamed shmup::safety to delayed_safety to prevent confusion

---
 game.cpp  | 4 ++--
 hyper.h   | 2 +-
 init.cpp  | 2 --
 shmup.cpp | 9 +++++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/game.cpp b/game.cpp
index 01758420..704e391d 100644
--- a/game.cpp
+++ b/game.cpp
@@ -6992,7 +6992,7 @@ bool collectItem(cell *c2, bool telekinesis) {
     playSound(c2, "pickup-orb"); // TODO safety
     items[c2->item] = 7;
     if(shmup::on)
-      shmup::safety = true;
+      shmup::delayed_safety = true;
     else 
       activateSafety(c2->land);
     return true;
@@ -7053,7 +7053,7 @@ bool collectItem(cell *c2, bool telekinesis) {
   else if(c2->item == itBuggy || c2->item == itBuggy2) {
     items[itOrbSafety] += 7;
     if(shmup::on)
-      shmup::safety = true;
+      shmup::delayed_safety = true;
     else {
       buggyGeneration = false;
       activateSafety(laCrossroads);
diff --git a/hyper.h b/hyper.h
index c4db7ab3..b041376e 100644
--- a/hyper.h
+++ b/hyper.h
@@ -883,7 +883,7 @@ namespace shmup {
   using namespace multi;
   void recall();
   extern bool on;
-  extern bool safety;
+  extern bool delayed_safety;
   extern int curtime;
   void clearMonsters();
   void clearMemory();
diff --git a/init.cpp b/init.cpp
index 95da3256..5436a7dc 100644
--- a/init.cpp
+++ b/init.cpp
@@ -44,8 +44,6 @@ void initAll() {
 #endif
   start_game();
   
-  shmup::safety = safety;
-
   if(!shmup::on) {
     restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0;
     restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0;
diff --git a/shmup.cpp b/shmup.cpp
index 813537c8..3cfe3a12 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -987,7 +987,8 @@ eItem keyresult[MAXPLAYER];
 
 ld fabsl(ld x) { return x>0?x:-x; }
 
-bool on = false, safety = false;
+bool on = false;
+bool delayed_safety = false;
 
 bool lastdead = false;
 
@@ -3467,9 +3468,9 @@ void turn(int delta) {
     
   active.clear();
 
-  if(safety) { 
+  if(delayed_safety) { 
     activateSafety(pc[0]->base->land);
-    safety = false;
+    delayed_safety = false;
     }
   }
 
@@ -3513,7 +3514,7 @@ void init() {
       addMessage(XLAT("Welcome to the Shoot'em Up mode!"));
     // addMessage(XLAT("F/;/Space/Enter/KP5 = fire, WASD/IJKL/Numpad = move"));
     }
-  else safety = false;
+  delayed_safety = false;
   }
 
 bool boatAt(cell *c) {