restore original .ini file name

FunkyFr3sh · Feb 3, 2024 · 93c6e12 · 93c6e12
1 parent 3997c03
commit 93c6e12
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/config/ConfigFormUnit.cpp b/config/ConfigFormUnit.cpp
@@ -40,7 +40,7 @@ void __fastcall TConfigForm::CreateParams(TCreateParams & Params)
 
 void __fastcall TConfigForm::LanguageImgClick(TObject *Sender)
 {
-	auto *ini = new TIniFile(".\\dd-hd.ini");
+	auto *ini = new TIniFile(".\\ddraw.ini");
 	ini->WriteString("ddraw", "configlang", IsEnglish ? "auto" : "english");
 	delete ini;
 
@@ -57,7 +57,7 @@ void __fastcall TConfigForm::LanguageImgClick(TObject *Sender)
 
 void __fastcall TConfigForm::ThemePnlClick(TObject *Sender)
 {
-	auto *ini = new TIniFile(".\\dd-hd.ini");
+	auto *ini = new TIniFile(".\\ddraw.ini");
 	auto theme =
 		ThemePnl->Color == (TColor)RGB(31, 31, 31) ? "Cobalt XEMedia" : "Windows10";
 
@@ -86,7 +86,7 @@ void __fastcall TConfigForm::RestoreDefaultsBtnClick(TObject *Sender)
 		return;
 	}
 
-	DeleteFile(".\\dd-hd.ini");
+	DeleteFile(".\\ddraw.ini");
 
 	ShellExecute(
 		NULL,
@@ -676,8 +676,8 @@ void __fastcall TConfigForm::CompatibilityBtnClick(TObject *Sender)
 
 void __fastcall TConfigForm::FormCreate(TObject *Sender)
 {
-	/* Let cnc-ddraw create a new dd-hd.ini if it doesn't exist */
-	if (FileExists(".\\ddraw.dll") && !FileExists(".\\dd-hd.ini")) {
+	/* Let cnc-ddraw create a new ddraw.ini if it doesn't exist */
+	if (FileExists(".\\ddraw.dll") && !FileExists(".\\ddraw.ini")) {
 
 		SetEnvironmentVariableW(L"cnc_ddraw_config_init", L"1");
 
@@ -701,7 +701,7 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender)
 		}
 	}
 
-	auto *ini = new TIniFile(".\\dd-hd.ini");
+	auto *ini = new TIniFile(".\\ddraw.ini");
 	auto *hd_ini = new TIniFile(".\\Warcraft II BNE.ini");
 
 	if (ini->ReadString("ddraw", "configtheme", "Windows10") == "Cobalt XEMedia") {
@@ -906,7 +906,7 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender)
 
 	RestoreDefaultsBtn->Visible =
 		FileExists(".\\ddraw.dll") &&
-		FileExists(".\\dd-hd.ini") &&
+		FileExists(".\\ddraw.ini") &&
 		GetBool(ini, "allow_reset", true);
 
 	delete ini;
@@ -920,7 +920,7 @@ void TConfigForm::SaveSettings()
 	if (!Initialized)
 		return;
 
-	auto *ini = new TIniFile(".\\dd-hd.ini");
+	auto *ini = new TIniFile(".\\ddraw.ini");
 	auto *hd_ini = new TIniFile(".\\Warcraft II BNE.ini");
 
 	/* Display Settings */

diff --git a/config/cnc-ddraw config.cpp b/config/cnc-ddraw config.cpp
@@ -31,7 +31,7 @@ int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 			return 0;
 		}
 
-		auto *ini = new TIniFile(".\\dd-hd.ini");
+		auto *ini = new TIniFile(".\\ddraw.ini");
 		auto theme = ini->ReadString("ddraw", "configtheme", "Windows10");
 
 		TStyleManager::TrySetStyle(

diff --git a/src/config.c b/src/config.c
@@ -685,6 +685,14 @@ static void cfg_create_ini()
             "maintas=false\n"
             "boxing=false\n"
             "\n"
+            "; Diablo\n"
+            "[Diablo]\n"
+            "devmode=true\n"
+            "\n"
+            "; Diablo: Hellfire\n"
+            "[hellfire]\n"
+            "devmode=true\n"
+            "\n"
             "; Eggsucker\n"
             "[eggsucker]\n"
             "fixpitch=true\n"
@@ -1003,7 +1011,7 @@ static void cfg_init()
     }
 
     /* set up settings ini */
-    strncpy(g_config.ini_path, ".\\dd-hd.ini", sizeof(g_config.ini_path) - 1);
+    strncpy(g_config.ini_path, ".\\ddraw.ini", sizeof(g_config.ini_path) - 1);
 
     if (GetFileAttributes(g_config.ini_path) == INVALID_FILE_ATTRIBUTES)
         cfg_create_ini();