Minor: Defined "ExecutionType::ManiacHook" & clarified Push instances…

… inside battle interpreter
florianessl · Feb 7, 2025 · 0d39709 · 0d39709
1 parent 513dd4a
commit 0d39709
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
@@ -409,7 +409,7 @@ template<InterpreterExecutionType type_ex>
 inline void Game_Interpreter::Push(Game_CommonEvent* ev) {
 	static_assert(type_ex == InterpreterExecutionType::AutoStart || type_ex == InterpreterExecutionType::Parallel
 		|| type_ex == InterpreterExecutionType::Call || type_ex == InterpreterExecutionType::DeathHandler
-		|| type_ex == InterpreterExecutionType::DebugCall, "Unexpected ExecutionType for CommonEvent"
+		|| type_ex == InterpreterExecutionType::DebugCall || type_ex == InterpreterExecutionType::ManiacHook, "Unexpected ExecutionType for CommonEvent"
 	);
 	PushInternal(ev, type_ex);
 }

diff --git a/src/game_interpreter_battle.cpp b/src/game_interpreter_battle.cpp
@@ -213,7 +213,7 @@ int Game_Interpreter_Battle::ScheduleNextPage(lcf::rpg::TroopPageCondition::Flag
 			continue;
 		}
 		Clear();
-		Push<ExecutionType::Eval, EventType::None>(page.event_commands, 0); // FIXME: clarify type_src & type_ex for battle events
+		Push<ExecutionType::Action, EventType::BattleEvent>(page.event_commands, 0);
 		executed[i] = true;
 		return i + 1;
 	}
@@ -647,7 +647,7 @@ bool Game_Interpreter_Battle::ManiacBattleHook(ManiacBattleHookType hook_type, i
 	}
 
 	// pushes the common event to be run into the queue of events.
-	maniac_interpreter->Push<ExecutionType::Call>(common_event); // FIXME: clarify type_src & type_ex for battle events
+	maniac_interpreter->Push<ExecutionType::ManiacHook>(common_event);
 
 	// pushes the change variable events into the interpreters
 	// event queue, so we don't run into a race condition.
@@ -685,7 +685,7 @@ bool Game_Interpreter_Battle::ManiacBattleHook(ManiacBattleHookType hook_type, i
 	}
 
 	// Push is actually "push_back", so this gets added before other events.
-	maniac_interpreter->Push<ExecutionType::Eval, EventType::None>(pre_commands, 0);  // FIXME: clarify type_src & type_ex for battle events
+	maniac_interpreter->Push<ExecutionType::ManiacHook, EventType::None>(pre_commands, 0);
 
 	// Necessary to start the sub-event.
 	maniac_interpreter->Update();

diff --git a/src/game_interpreter_shared.h b/src/game_interpreter_shared.h
@@ -63,7 +63,8 @@ namespace Game_Interpreter_Shared {
 		DeathHandler = 10,
 		/* Event code was dynamically evaluated. (ManiacCallCommand) */
 		Eval,
-		DebugCall
+		DebugCall,
+		ManiacHook
 	};
 	static constexpr auto kExecutionType = lcf::makeEnumTags<ExecutionType>(
 		"Action",