From 49360099480d523553a6046fa06177c2dcd2c283 Mon Sep 17 00:00:00 2001 From: captainurist <73941350+captainurist@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:29:20 +0800 Subject: [PATCH] Drop _5C35C0_force_party_death --- src/Engine/Engine.cpp | 2 +- src/Engine/mm7_data.cpp | 1 - src/Engine/mm7_data.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Engine/Engine.cpp b/src/Engine/Engine.cpp index 729657c5dc3a..f26dfc2fc9d6 100644 --- 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 index 9387f8812547..e9a9decb4486 100644 --- a/src/Engine/mm7_data.cpp +++ b/src/Engine/mm7_data.cpp @@ -2426,7 +2426,6 @@ int dword_5B65C4_cancelEventProcessing; int npcIdToDismissAfterDialogue; // std::array byte_5C3427; -int _5C35C0_force_party_death = false; int bDialogueUI_InitializeActor_NPC_ID; // std::array byte_5C8D1A; diff --git a/src/Engine/mm7_data.h b/src/Engine/mm7_data.h index b4d6b9b89ae3..87da28034a4e 100644 --- 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;