Use DBArray for EventCommand::parameters

Author: mateofio

src/game_interpreter.cpp

@@ -481,7 +481,7 @@ void Game_Interpreter::SkipToNextConditional(std::initializer_list<Cmd> codes, i
 	}
 }
 
-int Game_Interpreter::DecodeInt(std::vector<int32_t>::const_iterator& it) {
+int Game_Interpreter::DecodeInt(lcf::DBArray<int32_t>::const_iterator& it) {
 	int value = 0;
 
 	for (;;) {
@@ -495,7 +495,7 @@ int Game_Interpreter::DecodeInt(std::vector<int32_t>::const_iterator& it) {
 	return value;
 }
 
-const std::string Game_Interpreter::DecodeString(std::vector<int32_t>::const_iterator& it) {
+const std::string Game_Interpreter::DecodeString(lcf::DBArray<int32_t>::const_iterator& it) {
 	std::ostringstream out;
 	int len = DecodeInt(it);
 
@@ -507,7 +507,7 @@ const std::string Game_Interpreter::DecodeString(std::vector<int32_t>::const_ite
 	return result;
 }
 
-lcf::rpg::MoveCommand Game_Interpreter::DecodeMove(std::vector<int32_t>::const_iterator& it) {
+lcf::rpg::MoveCommand Game_Interpreter::DecodeMove(lcf::DBArray<int32_t>::const_iterator& it) {
 	lcf::rpg::MoveCommand cmd;
 	cmd.command_id = *it++;
 
@@ -2696,9 +2696,9 @@ bool Game_Interpreter::CommandMoveEvent(lcf::rpg::EventCommand const& com) { //
 		route.repeat = com.parameters[2] != 0;
 		route.skippable = com.parameters[3] != 0;
 
-		std::vector<int32_t>::const_iterator it;
-		for (it = com.parameters.begin() + 4; it < com.parameters.end(); )
+		for (auto it = com.parameters.begin() + 4; it < com.parameters.end(); ) {
 			route.move_commands.push_back(DecodeMove(it));
+		}
 
 		event->ForceMoveRoute(route, move_freq);
 	}

src/game_interpreter.h

@@ -24,6 +24,7 @@
 #include "async_handler.h"
 #include "game_character.h"
 #include "game_actor.h"
+#include <lcf/dbarray.h>
 #include <lcf/rpg/fwd.h>
 #include <lcf/rpg/eventcommand.h>
 #include "system.h"
@@ -253,9 +254,9 @@ class Game_Interpreter
 	bool CommandExitGame(lcf::rpg::EventCommand const& com);
 	bool CommandToggleFullscreen(lcf::rpg::EventCommand const& com);
 
-	int DecodeInt(std::vector<int32_t>::const_iterator& it);
-	const std::string DecodeString(std::vector<int32_t>::const_iterator& it);
-	lcf::rpg::MoveCommand DecodeMove(std::vector<int32_t>::const_iterator& it);
+	int DecodeInt(lcf::DBArray<int32_t>::const_iterator& it);
+	const std::string DecodeString(lcf::DBArray<int32_t>::const_iterator& it);
+	lcf::rpg::MoveCommand DecodeMove(lcf::DBArray<int32_t>::const_iterator& it);
 
 	void SetSubcommandIndex(int indent, int idx);
 	uint8_t& ReserveSubcommandIndex(int indent);