From 786f1558f90ba8778d4624b390b44b39e64d2710 Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:26:16 +0000 Subject: [PATCH 1/9] Update SettingsClass.cpp --- Source/Project64-core/Settings/SettingsClass.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Project64-core/Settings/SettingsClass.cpp b/Source/Project64-core/Settings/SettingsClass.cpp index 33a5cb30d..478c90069 100644 --- a/Source/Project64-core/Settings/SettingsClass.cpp +++ b/Source/Project64-core/Settings/SettingsClass.cpp @@ -171,7 +171,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Game_File, new CSettingTypeTempString("")); AddHandler(Game_UniqueSaveDir, new CSettingTypeTempString("")); AddHandler(Game_GameName, new CSettingTypeTempString("")); - AddHandler(Game_GoodName, new CSettingTypeGame("Good Name", Rdb_GoodName)); + AddHandler(Cfg_GoodName, new CSettingTypeGame("Good Name", "")); AddHandler(Game_TempLoaded, new CSettingTypeTempBool(false)); AddHandler(Game_SystemType, new CSettingTypeTempNumber(SYSTEM_NTSC)); AddHandler(Game_EditPlugin_Gfx, new CSettingTypeGame("Plugin-Gfx", Default_None)); @@ -1280,4 +1280,4 @@ void CSettings::UnregisterChangeCB(SettingID Type, void * Data, SettingChangedFu { g_Notify->BreakPoint(__FILE__, __LINE__); } -} \ No newline at end of file +} From 24a1635b9c331738d4e50f2b3eeb87a571b1f904 Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:30:44 +0000 Subject: [PATCH 2/9] Update SettingsPage-Game-General.cpp --- .../UserInterface/Settings/SettingsPage-Game-General.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp index bac02c5b5..d9f296420 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp @@ -77,7 +77,7 @@ CGameGeneralPage::CGameGeneralPage(HWND hParent, const RECT & rcDispay) ComboBox->AddItemW(wGS(NUMBER_6).c_str(), 6); } - SetDlgItemText(IDC_GOOD_NAME, g_Settings->LoadStringVal(Game_GoodName).c_str()); + SetDlgItemText(IDC_GOOD_NAME, g_Settings->LoadStringVal(Rdb_GoodName).c_str()); CModifiedEditBox * TxtBox = AddModTextBox(GetDlgItem(IDC_VIREFRESH), Game_ViRefreshRate, false); TxtBox->SetTextField(GetDlgItem(IDC_VIREFESH_TEXT)); @@ -112,4 +112,4 @@ bool CGameGeneralPage::EnableReset(void) void CGameGeneralPage::ResetPage() { CSettingsPageImpl::ResetPage(); -} \ No newline at end of file +} From 095caffa42efee6d71cd771821767ef51336489f Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:31:56 +0000 Subject: [PATCH 3/9] Update GuiClass.cpp --- Source/Project64/UserInterface/GuiClass.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64/UserInterface/GuiClass.cpp b/Source/Project64/UserInterface/GuiClass.cpp index 0e7f74458..045be9ca8 100644 --- a/Source/Project64/UserInterface/GuiClass.cpp +++ b/Source/Project64/UserInterface/GuiClass.cpp @@ -201,7 +201,7 @@ void CMainGui::GameLoaded(CMainGui * Gui) { WriteTrace(TraceUserInterface, TraceDebug, "Add Recent Rom"); Gui->AddRecentRom(FileLoc.c_str()); - Gui->SetWindowCaption(stdstr(g_Settings->LoadStringVal(Game_GoodName)).ToUTF16().c_str()); + Gui->SetWindowCaption(stdstr(g_Settings->LoadStringVal(Rdb_GoodName)).ToUTF16().c_str()); } } From 3488bc6c5e59d9f5877a930c57729304d767b358 Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:33:13 +0000 Subject: [PATCH 4/9] Update MainMenuClass.cpp --- Source/Project64/UserInterface/MainMenuClass.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Project64/UserInterface/MainMenuClass.cpp b/Source/Project64/UserInterface/MainMenuClass.cpp index b86c6fae0..b5d5bdf38 100644 --- a/Source/Project64/UserInterface/MainMenuClass.cpp +++ b/Source/Project64/UserInterface/MainMenuClass.cpp @@ -625,11 +625,11 @@ std::wstring CMainMenu::GetSaveSlotString(int Slot) } if (Slot != 0) { - FileName.SetNameExtension(stdstr_f("%s.pj%d", g_Settings->LoadStringVal(Game_GoodName).c_str(), Slot).c_str()); + FileName.SetNameExtension(stdstr_f("%s.pj%d", g_Settings->LoadStringVal(Rdb_GoodName).c_str(), Slot).c_str()); } else { - FileName.SetNameExtension(stdstr_f("%s.pj", g_Settings->LoadStringVal(Game_GoodName).c_str()).c_str()); + FileName.SetNameExtension(stdstr_f("%s.pj", g_Settings->LoadStringVal(Rdb_GoodName).c_str()).c_str()); } if (g_Settings->LoadDword(Setting_AutoZipInstantSave)) @@ -1301,4 +1301,4 @@ void CMainMenu::ResetMenu(void) ResetAccelerators(); WriteTrace(TraceUserInterface, TraceDebug, "Done"); -} \ No newline at end of file +} From a19e425ad4bfc23d1506e3d73ab48e034942d142 Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:35:37 +0000 Subject: [PATCH 5/9] Update SettingsConfig.cpp --- Source/Project64/UserInterface/SettingsConfig.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Project64/UserInterface/SettingsConfig.cpp b/Source/Project64/UserInterface/SettingsConfig.cpp index 110b792bc..cfd8be780 100644 --- a/Source/Project64/UserInterface/SettingsConfig.cpp +++ b/Source/Project64/UserInterface/SettingsConfig.cpp @@ -80,7 +80,7 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /* if (!GameIni.empty()) { - ConfigRomTitle.Format("Config: %s", g_Settings->LoadStringVal(Game_GoodName).c_str()); + ConfigRomTitle.Format("Config: %s", g_Settings->LoadStringVal(Rdb_GoodName).c_str()); } RECT rcSettingInfo; @@ -251,9 +251,9 @@ void CSettingConfig::ApplySettings(bool UpdateScreen) if (!GameIni.empty()) { stdstr GoodName; - if (!g_Settings->LoadStringVal(Game_GoodName, GoodName)) + if (!g_Settings->LoadStringVal(Cfg_GoodName, GoodName)) { - g_Settings->SaveString(Game_GoodName, GoodName); + g_Settings->SaveString(Cfg_GoodName, GoodName); } } @@ -279,7 +279,7 @@ void CSettingConfig::ApplySettings(bool UpdateScreen) stdstr GoodName = g_Settings->LoadStringVal(Rdb_GoodName); if (GoodName.length() > 0) { - g_Settings->SaveString(Game_GoodName, GoodName); + g_Settings->SaveString(Cfg_GoodName, GoodName); } } CSettingTypeApplication::Flush(); From b1bef3c6872d1880b9ec8d2347329d6d943c1545 Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:36:51 +0000 Subject: [PATCH 6/9] Update Settings.h --- Source/Project64-core/Settings/Settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64-core/Settings/Settings.h b/Source/Project64-core/Settings/Settings.h index 4e954e243..5675a9e92 100644 --- a/Source/Project64-core/Settings/Settings.h +++ b/Source/Project64-core/Settings/Settings.h @@ -102,7 +102,7 @@ enum SettingID Game_File, Game_UniqueSaveDir, Game_GameName, - Game_GoodName, + Cfg_GoodName, Game_TempLoaded, Game_SystemType, Game_EditPlugin_Gfx, From 210bfb382bf536e3ffc08de4ee34cb5001d67bbd Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 15:39:12 +0000 Subject: [PATCH 7/9] Update N64Class.cpp --- Source/Project64-core/N64System/N64Class.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp index 9d723e433..c34714273 100644 --- a/Source/Project64-core/N64System/N64Class.cpp +++ b/Source/Project64-core/N64System/N64Class.cpp @@ -298,7 +298,7 @@ bool CN64System::LoadFileImage(const char * FileLoc) g_Settings->SaveString(Game_File, FileLoc); g_Settings->SaveBool(GameRunning_LoadingInProgress, false); - WriteTrace(TraceN64System, TraceDebug, "Finished Loading (GoodName: %s)", g_Settings->LoadStringVal(Game_GoodName).c_str()); + WriteTrace(TraceN64System, TraceDebug, "Finished Loading (GoodName: %s)", g_Settings->LoadStringVal(Rdb_GoodName).c_str()); } else { @@ -1513,7 +1513,7 @@ bool CN64System::SaveState() { SaveFile.AppendDirectory(g_Settings->LoadStringVal(Game_UniqueSaveDir).c_str()); } - SaveFile.SetName(g_Settings->LoadStringVal(Game_GoodName).c_str()); + SaveFile.SetName(g_Settings->LoadStringVal(Rdb_GoodName).c_str()); g_Settings->SaveDword(Game_LastSaveSlot, g_Settings->LoadDword(Game_CurrentSaveState)); } stdstr_f target_ext("pj%s", Slot != 0 ? stdstr_f("%d", Slot).c_str() : ""); @@ -1669,11 +1669,11 @@ bool CN64System::LoadState() } if (g_Settings->LoadDword(Game_CurrentSaveState) != 0) { - FileName.SetNameExtension(stdstr_f("%s.pj%d", g_Settings->LoadStringVal(Game_GoodName).c_str(), g_Settings->LoadDword(Game_CurrentSaveState)).c_str()); + FileName.SetNameExtension(stdstr_f("%s.pj%d", g_Settings->LoadStringVal(Rdb_GoodName).c_str(), g_Settings->LoadDword(Game_CurrentSaveState)).c_str()); } else { - FileName.SetNameExtension(stdstr_f("%s.pj", g_Settings->LoadStringVal(Game_GoodName).c_str()).c_str()); + FileName.SetNameExtension(stdstr_f("%s.pj", g_Settings->LoadStringVal(Rdb_GoodName).c_str()).c_str()); } CPath ZipFileName; From d366063620a4d7fa1ca69b89618400ba35c30fcd Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 18:59:56 +0000 Subject: [PATCH 8/9] Update SettingsConfig.cpp --- Source/Project64/UserInterface/SettingsConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64/UserInterface/SettingsConfig.cpp b/Source/Project64/UserInterface/SettingsConfig.cpp index cfd8be780..d371c9c78 100644 --- a/Source/Project64/UserInterface/SettingsConfig.cpp +++ b/Source/Project64/UserInterface/SettingsConfig.cpp @@ -251,7 +251,7 @@ void CSettingConfig::ApplySettings(bool UpdateScreen) if (!GameIni.empty()) { stdstr GoodName; - if (!g_Settings->LoadStringVal(Cfg_GoodName, GoodName)) + if (!g_Settings->LoadStringVal(Rdb_GoodName, GoodName)) { g_Settings->SaveString(Cfg_GoodName, GoodName); } From 8847751a0fb73d154a4abf446744dfa3fd60ed82 Mon Sep 17 00:00:00 2001 From: Frank-74 Date: Tue, 31 Jan 2017 19:12:12 +0000 Subject: [PATCH 9/9] Update SettingsConfig.cpp --- Source/Project64/UserInterface/SettingsConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64/UserInterface/SettingsConfig.cpp b/Source/Project64/UserInterface/SettingsConfig.cpp index d371c9c78..ee642b629 100644 --- a/Source/Project64/UserInterface/SettingsConfig.cpp +++ b/Source/Project64/UserInterface/SettingsConfig.cpp @@ -251,7 +251,7 @@ void CSettingConfig::ApplySettings(bool UpdateScreen) if (!GameIni.empty()) { stdstr GoodName; - if (!g_Settings->LoadStringVal(Rdb_GoodName, GoodName)) + if (g_Settings->LoadStringVal(Rdb_GoodName, GoodName)) { g_Settings->SaveString(Cfg_GoodName, GoodName); }