ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1269 from Frank-74/Rename-Game_GoodName 

Fix GoodName missing from Project64.cfg
This commit is contained in:
zilmar 2017-02-01 06:22:42 +11:00 committed by GitHub
parent a54279ca59 8847751a0f
commit 6d8933674d
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64-core/N64System/N64Class.cpp
View File

@ -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;

2
Source/Project64-core/Settings/Settings.h
View File

@ -102,7 +102,7 @@ enum SettingID
Game_File,
Game_UniqueSaveDir,
Game_GameName,
Game_GoodName,
Cfg_GoodName,
Game_TempLoaded,
Game_SystemType,
Game_EditPlugin_Gfx,

4
Source/Project64-core/Settings/SettingsClass.cpp
View File

@ -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__);
}
}
}

2
Source/Project64/UserInterface/GuiClass.cpp
View File

@ -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());
}
}

6
Source/Project64/UserInterface/MainMenuClass.cpp
View File

@ -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");
}
}

4
Source/Project64/UserInterface/Settings/SettingsPage-Game-General.cpp
View File

@ -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<CGameGeneralPage>::ResetPage();
}
}

8
Source/Project64/UserInterface/SettingsConfig.cpp
View File

@ -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(Rdb_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();