Debug fix: some intepreter state flags were incorrectly applied to fr…

…ame instead of state
florianessl · Jun 6, 2024 · 32b4185 · 32b4185
1 parent 15ff028
commit 32b4185
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
@@ -595,18 +595,18 @@ void Game_Interpreter::Update(bool reset_loop_count) {
 // Setup Starting Event
 void Game_Interpreter::Push(Game_Event* ev) {
 	Push(ev->GetList(), ev->GetId(), ev->WasStartedByDecisionKey(), ev->GetActivePage() ? ev->GetActivePage()->ID : 0, eEx_Normal);
-	GetFrame().easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_map_event;
+	_state.easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_map_event;
 }
 
 void Game_Interpreter::Push(Game_Event* ev, const lcf::rpg::EventPage* page, bool triggered_by_decision_key, ExecutionType exType) {
 	Push(page->event_commands, ev->GetId(), triggered_by_decision_key, page->ID, exType);
-	GetFrame().easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_map_event;
+	_state.easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_map_event;
 }
 
 void Game_Interpreter::Push(Game_CommonEvent* ev, ExecutionType exType) {
 	Push(ev->GetList(), 0, false, 0, exType);
 	GetFrame().maniac_event_id = ev->GetIndex();
-	GetFrame().easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_common_event;
+	_state.easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_common_event;
 }
 
 bool Game_Interpreter::CheckGameOver() {

diff --git a/src/game_interpreter_battle.cpp b/src/game_interpreter_battle.cpp
@@ -173,7 +173,7 @@ int Game_Interpreter_Battle::ScheduleNextPage(lcf::rpg::TroopPageCondition::Flag
 		}
 		Clear();
 		Push(page.event_commands, 0);
-		GetFrame().easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_battle_event;
+		_state.easyrpg_runtime_flags |= lcf::rpg::SaveEventExecState::RuntimeFlags_battle_event;
 		executed[i] = true;
 		return i + 1;
 	}