Drop _5C35C0_force_party_death

captainurist · Sep 19, 2023 · 4936009 · 4936009
1 parent 5afd52a
commit 4936009
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/src/Engine/Engine.cpp b/src/Engine/Engine.cpp
@@ -1454,7 +1454,7 @@ void _494035_timed_effects__water_walking_damage__etc() {
                     break;
                 }
             }
-            if (!numPlayersCouldAct || _5C35C0_force_party_death)
+            if (!numPlayersCouldAct)
                 uGameState = GAME_STATE_PARTY_DIED;
         }
     }

diff --git a/src/Engine/mm7_data.cpp b/src/Engine/mm7_data.cpp
@@ -2426,7 +2426,6 @@ int dword_5B65C4_cancelEventProcessing;
 int npcIdToDismissAfterDialogue;
 // std::array<char, 777> byte_5C3427;
 
-int _5C35C0_force_party_death = false;
 int bDialogueUI_InitializeActor_NPC_ID;
 
 // std::array<char, 777> byte_5C8D1A;

diff --git a/src/Engine/mm7_data.h b/src/Engine/mm7_data.h
@@ -102,7 +102,6 @@ extern std::string branchless_dialogue_str;
 
 extern int dword_5B65C4_cancelEventProcessing;
 extern int npcIdToDismissAfterDialogue;
-extern int _5C35C0_force_party_death;
 extern int bDialogueUI_InitializeActor_NPC_ID;
 
 extern int uDefaultTravelTime_ByFoot;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1454,7 +1454,7 @@ void _494035_timed_effects__water_walking_damage__etc() { @@
                         break;
                     }
                 }
-                if (!numPlayersCouldAct || _5C35C0_force_party_death)
+                if (!numPlayersCouldAct)
                     uGameState = GAME_STATE_PARTY_DIED;
             }
         }
@@ Expand Down @@