RuntimeFlags: Refactored some bits that came up in code review

Author: florianessl

src/game_interpreter.cpp

@@ -384,6 +384,9 @@ void Game_Interpreter::Update(bool reset_loop_count) {
 
 #ifdef ENABLE_DYNAMIC_INTERPRETER_CONFIG
 	Player::active_interpreter_flags = &_state.easyrpg_runtime_flags;
+	auto flags_guard = lcf::makeScopeGuard([]() {
+		Player::active_interpreter_flags = nullptr;
+	});
 #endif
 
 	for (; loop_count < loop_limit; ++loop_count) {
@@ -530,9 +533,6 @@ void Game_Interpreter::Update(bool reset_loop_count) {
 	if (Game_Map::GetNeedRefresh()) {
 		Game_Map::Refresh();
 	}
-#ifdef ENABLE_DYNAMIC_INTERPRETER_CONFIG
-	Player::active_interpreter_flags = nullptr;
-#endif
 }
 
 // Setup Starting Event
@@ -838,7 +838,9 @@ bool Game_Interpreter::OnFinishStackFrame() {
 
 	if (is_base_frame) {
 #ifdef ENABLE_DYNAMIC_INTERPRETER_CONFIG
-		ClearStateRuntimeFlags();
+		// Individual runtime flags that may still be set will be cleared by
+		// CommandEasyRpgSetInterpreterFlag if neccessary
+		_state.easyrpg_runtime_flags.conf_override_active = false;
 #endif
 	}
 
@@ -5394,6 +5396,11 @@ bool Game_Interpreter::CommandEasyRpgSetInterpreterFlag(lcf::rpg::EventCommand c
 		}
 	}
 
+	// Clear any inactive flags that might be left over from a previous InterpreterFlag command
+	if (!_state.easyrpg_runtime_flags.conf_override_active) {
+		_state.easyrpg_runtime_flags.flags.fill(false);
+	}
+
 	switch (flag_id) {
 		case 1:
 			if (flag_value) {

src/game_interpreter.h

@@ -347,10 +347,6 @@ class Game_Interpreter : public Game_BaseInterpreterContext
 
 	int ManiacBitmask(int value, int mask) const;
 
-#ifdef ENABLE_DYNAMIC_INTERPRETER_CONFIG
-	void ClearStateRuntimeFlags();
-#endif
-
 	lcf::rpg::SaveEventExecState _state;
 	KeyInputState _keyinput;
 	AsyncOp _async_op = {};
@@ -405,11 +401,4 @@ inline AsyncOp Game_Interpreter::GetAsyncOp() const {
 	return _async_op;
 }
 
-#ifdef ENABLE_DYNAMIC_INTERPRETER_CONFIG
-inline void Game_Interpreter::ClearStateRuntimeFlags() {
-	_state.easyrpg_runtime_flags.conf_override_active = false;
-	_state.easyrpg_runtime_flags.flags.fill(false);
-}
-#endif
-
 #endif

src/game_interpreter_shared.h

@@ -109,7 +109,7 @@ namespace Game_Interpreter_Shared {
 	bool ManiacCheckContinueLoop(int val, int val2, int type, int op);
 
 #ifdef ENABLE_DYNAMIC_INTERPRETER_CONFIG
-	typedef bool lcf::rpg::SaveEventExecState::EasyRpgStateRuntime_Flags::* StateRuntimeFlagRef;
+	using StateRuntimeFlagRef = bool lcf::rpg::SaveEventExecState::EasyRpgStateRuntime_Flags::*;
 
 	std::optional<bool> GetRuntimeFlag(lcf::rpg::SaveEventExecState const& state, StateRuntimeFlagRef const field_on, StateRuntimeFlagRef const field_off);
 

src/window_interpreter.cpp

@@ -44,7 +44,7 @@ namespace {
 struct RuntimeFlagInfo {
 	bool (*config_fn)();
 	Game_Interpreter_Shared::StateRuntimeFlagRef field_on, field_off;
-	char* name;
+	std::string_view name;
 };
 
 using StateFlags = lcf::rpg::SaveEventExecState::EasyRpgStateRuntime_Flags;