Merge pull request #3106 from EasyRPG-NewFeatures/jetrotal-executeCommand-alternative

Add ExecuteCommand(com);

Author: Ghabry

src/game_interpreter.cpp

@@ -615,7 +615,10 @@ lcf::rpg::MoveCommand Game_Interpreter::DecodeMove(lcf::DBArray<int32_t>::const_
 bool Game_Interpreter::ExecuteCommand() {
 	auto& frame = GetFrame();
 	const auto& com = frame.commands[frame.current_command];
+	return ExecuteCommand(com);
+}
 
+bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 	switch (static_cast<Cmd>(com.code)) {
 		case Cmd::ShowMessage:
 			return CommandShowMessage(com);

src/game_interpreter.h

@@ -75,7 +75,8 @@ class Game_Interpreter
 	void InputButton();
 	void SetupChoices(const std::vector<std::string>& choices, int indent, PendingMessage& pm);
 
-	virtual bool ExecuteCommand();
+	bool ExecuteCommand();
+	virtual bool ExecuteCommand(lcf::rpg::EventCommand const& com);
 
 
 	/**

src/game_interpreter_battle.cpp

@@ -154,10 +154,7 @@ int Game_Interpreter_Battle::ScheduleNextPage(lcf::rpg::TroopPageCondition::Flag
 }
 
 // Execute Command.
-bool Game_Interpreter_Battle::ExecuteCommand() {
-	auto& frame = GetFrame();
-	const auto& com = frame.commands[frame.current_command];
-
+bool Game_Interpreter_Battle::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 	switch (static_cast<Cmd>(com.code)) {
 		case Cmd::CallCommonEvent:
 			return CommandCallCommonEvent(com);
@@ -194,7 +191,7 @@ bool Game_Interpreter_Battle::ExecuteCommand() {
 		case Cmd::Maniac_GetBattleInfo:
 			return CommandManiacGetBattleInfo(com);
 		default:
-			return Game_Interpreter::ExecuteCommand();
+			return Game_Interpreter::ExecuteCommand(com);
 	}
 }
 

src/game_interpreter_battle.h

@@ -57,7 +57,8 @@ class Game_Interpreter_Battle : public Game_Interpreter
 
 	bool IsForceFleeEnabled() const;
 
-	bool ExecuteCommand() override;
+	bool ExecuteCommand(lcf::rpg::EventCommand const& com) override;
+
 private:
 	bool CommandCallCommonEvent(lcf::rpg::EventCommand const& com);
 	bool CommandForceFlee(lcf::rpg::EventCommand const& com);

src/game_interpreter_map.cpp

@@ -86,10 +86,7 @@ void Game_Interpreter_Map::OnMapChange() {
 /**
  * Execute Command.
  */
-bool Game_Interpreter_Map::ExecuteCommand() {
-	auto& frame = GetFrame();
-	const auto& com = frame.commands[frame.current_command];
-
+bool Game_Interpreter_Map::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 	switch (static_cast<Cmd>(com.code)) {
 		case Cmd::RecallToLocation:
 			return CommandRecallToLocation(com);
@@ -146,7 +143,7 @@ bool Game_Interpreter_Map::ExecuteCommand() {
 		case Cmd::ToggleAtbMode:
 			return CommandToggleAtbMode(com);
 		default:
-			return Game_Interpreter::ExecuteCommand();
+			return Game_Interpreter::ExecuteCommand(com);
 	}
 }
 

src/game_interpreter_map.h

@@ -51,7 +51,7 @@ class Game_Interpreter_Map : public Game_Interpreter
 	 */
 	void OnMapChange();
 
-	bool ExecuteCommand() override;
+	bool ExecuteCommand(lcf::rpg::EventCommand const& com) override;
 
 private:
 	bool CommandRecallToLocation(lcf::rpg::EventCommand const& com);