Fixed handling of INI files in game root directory. (#282)

* Fixed handling of INI files in game root directory. * fixup! Fixed handling of INI files in game root directory.
cleolibrary · Feb 5, 2025 · 1811b2d · 1811b2d
1 parent bd49199
commit 1811b2d
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/cleo_plugins/IniFiles/IniFiles.cpp b/cleo_plugins/IniFiles/IniFiles.cpp
@@ -5,6 +5,20 @@
 
 using namespace CLEO;
 
+// In case of naked file names without parent path INI file APIs searchs in Windows directory. Add leading ".\" to prevent that.
+static void fixIniFilepath(char* buff)
+{
+	if (!std::filesystem::path(buff).has_parent_path())
+	{
+		std::string filename = buff;
+		strcpy(buff, ".\\");
+		strcat(buff, filename.c_str());
+	}
+}
+
+#define OPCODE_READ_PARAM_FILEPATH_INI(_varName) OPCODE_READ_PARAM_FILEPATH(_varName); fixIniFilepath(_buff_##_varName)
+
+
 class IniFiles
 {
 public:
@@ -35,7 +49,7 @@ class IniFiles
 		0AF0=4,%4d% = get_int_from_ini_file %1s% section %2s% key %3s%
 		****************************************************************/
 	{
-		OPCODE_READ_PARAM_FILEPATH(path);
+		OPCODE_READ_PARAM_FILEPATH_INI(path);
 		OPCODE_READ_PARAM_STRING(section);
 		OPCODE_READ_PARAM_STRING(key);
 
@@ -88,7 +102,7 @@ class IniFiles
 		****************************************************************/
 	{
 		auto value = OPCODE_READ_PARAM_INT();
-		OPCODE_READ_PARAM_FILEPATH(path);
+		OPCODE_READ_PARAM_FILEPATH_INI(path);
 		OPCODE_READ_PARAM_STRING(section);
 		OPCODE_READ_PARAM_STRING(key);
 
@@ -111,7 +125,7 @@ class IniFiles
 		0AF2=4,%4d% = get_float_from_ini_file %1s% section %2s% key %3s%
 		****************************************************************/
 	{
-		OPCODE_READ_PARAM_FILEPATH(path);
+		OPCODE_READ_PARAM_FILEPATH_INI(path);
 		OPCODE_READ_PARAM_STRING(section);
 		OPCODE_READ_PARAM_STRING(key);
 
@@ -153,7 +167,7 @@ class IniFiles
 		****************************************************************/
 	{
 		auto value = OPCODE_READ_PARAM_FLOAT();
-		OPCODE_READ_PARAM_FILEPATH(path);
+		OPCODE_READ_PARAM_FILEPATH_INI(path);
 		OPCODE_READ_PARAM_STRING(section);
 		OPCODE_READ_PARAM_STRING(key);
 
@@ -176,7 +190,7 @@ class IniFiles
 		0AF4=4,%4d% = read_string_from_ini_file %1s% section %2s% key %3s%
 		****************************************************************/
 	{
-		OPCODE_READ_PARAM_FILEPATH(path);
+		OPCODE_READ_PARAM_FILEPATH_INI(path);
 		OPCODE_READ_PARAM_STRING(section);
 		OPCODE_READ_PARAM_STRING(key);
 
@@ -201,7 +215,7 @@ class IniFiles
 		****************************************************************/
 	{
 		OPCODE_READ_PARAM_STRING(strValue);
-		OPCODE_READ_PARAM_FILEPATH(path);
+		OPCODE_READ_PARAM_FILEPATH_INI(path);
 		OPCODE_READ_PARAM_STRING(section);
 		OPCODE_READ_PARAM_STRING(key);