StringVar: support more text types

also remove debug statements
EasyRPG · Jul 5, 2023 · 9951608 · 9951608
1 parent 694c5bb
commit 9951608
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/filefinder.cpp b/src/filefinder.cpp
@@ -68,7 +68,7 @@ namespace {
 	constexpr const auto SOUND_TYPES = Utils::MakeSvArray(
 			".opus", ".oga", ".ogg", ".wav", ".mp3", ".wma");
 	constexpr const auto FONTS_TYPES = Utils::MakeSvArray(".fon", ".fnt", ".bdf", ".ttf", ".ttc", ".otf", ".woff2", ".woff");
-	constexpr const auto TEXT_TYPES = Utils::MakeSvArray(".txt", ".csv");
+	constexpr const auto TEXT_TYPES = Utils::MakeSvArray(".txt", ".csv", ".svg", ".xml", ".json", ".yml", ".yaml");
 }
 
 FilesystemView FileFinder::Game() {

diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
@@ -3606,8 +3606,6 @@ bool Game_Interpreter::CommandConditionalBranch(lcf::rpg::EventCommand const& co
 			int op = com.parameters[4] & 3;
 			int ignoreCase = com.parameters[4] >> 8 & 1;
 
-			//Output::Debug("conditional string {}", com.string);
-			//Output::Debug("params {} {} {} {} {}", com.parameters[0], com.parameters[1], com.parameters[2], com.parameters[3], com.parameters[4]);
 			std::string str_l = static_cast<std::string>(Main_Data::game_strings->GetWithMode(com.string, com.parameters[2], modes[0]+1));
 			std::string str_r = static_cast<std::string>(Main_Data::game_strings->GetWithMode(com.string, com.parameters[3], modes[1]));
 			result = ManiacCheckString(str_l, str_r, op, ignoreCase);
@@ -4723,13 +4721,6 @@ bool Game_Interpreter::CommandManiacControlStrings(lcf::rpg::EventCommand const&
 		extract_flag,
 	};
 
-	Output::Debug("com.string: {}", com.string);
-	Output::Debug("string_mode {} string_id_0 {}", string_mode, string_id_0);
-	Output::Debug("op {} fn {} flags {}", op, fn, flags);
-	Output::Debug("hex {} extractt {} first {}", hex_flag, extract_flag, first_flag);
-	Output::Debug("args {} {} {} {}", args[0], args[1], args[2], args[3]);
-	Output::Debug("modes {} {} {} {}", modes[0], modes[1], modes[2], modes[3]);
-
 	switch (op)
 	{
 	case 0: //asg <fn(string text)>