StoreCommands (2099) - Use kCodeTags.tag instead of custom tag reader

EasyRPG · Dec 22, 2023 · 47940ef · 47940ef
1 parent d5f00c3
commit 47940ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/constants.h b/src/constants.h
@@ -17,7 +17,7 @@
 
 #include "utils.h"
 #include <iostream>
-#include <map>
+#include <unordered_map>
 #include <string>
 
 class Constants {

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
@@ -5099,7 +5099,6 @@ bool Game_Interpreter::CommandStoreCommands(lcf::rpg::EventCommand const& com) {
 	}
 
 	std::string rawCommand = " ";
-	Constants constList;
 
 	const auto& list = evtType == 1 ? common_event->GetList() : page->event_commands;
 	int index = 0;
@@ -5122,8 +5121,14 @@ bool Game_Interpreter::CommandStoreCommands(lcf::rpg::EventCommand const& com) {
 		std::string preffix(list[i].indent, '	');
 		std::string suffix = i < list.size() - 1 ? "\n" : "";
 
+		auto cmd_tag = lcf::rpg::EventCommand::kCodeTags.tag(list[i].code);
+		std::string command_id;
+
+		if (!cmd_tag) command_id = std::to_string(list[i].code);
+		else command_id = cmd_tag;
+
 		rawCommand += fmt::format("{}${}, \"{}\", [{}], {};{}",
-			preffix, constList.get("EventCode", std::to_string(list[i].code), 1), inputString, ss.str(), list[i].indent, suffix);
+			preffix, command_id, inputString, ss.str(), list[i].indent, suffix);
 	}
 
 	Game_Strings::Str_Params str_params = { targetStrVar,0, 0 };