From 9ab7a83c2686ee8e160fda22452de38aa986e7a1 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 20 Dec 2018 16:08:26 +1030 Subject: [PATCH] [Project64] Remove FR_None option --- Source/Project64-core/Multilanguage/LanguageClass.cpp | 3 +-- Source/Project64-core/N64System/N64Types.h | 2 +- Source/Project64-core/Settings.cpp | 6 +----- .../UserInterface/Settings/SettingsPage-AdvancedOptions.cpp | 5 ++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp index 8fd68e49a..e0ff1a3c8 100644 --- a/Source/Project64-core/Multilanguage/LanguageClass.cpp +++ b/Source/Project64-core/Multilanguage/LanguageClass.cpp @@ -354,8 +354,7 @@ void CLanguage::LoadDefaultStrings(void) DEF_STR(STR_FR_VIS, "Vertical interrupts per second"); DEF_STR(STR_FR_DLS, "Display lists per second"); DEF_STR(STR_FR_PERCENT, "Percentage of full speed"); - DEF_STR(STR_FR_DLS_VIS, "VI/s & DL/s"); - DEF_STR(STR_FR_NONE, "None"); + DEF_STR(STR_FR_DLS_VIS, "VI/s & DL/s"); // Increase speed DEF_STR(STR_INSREASE_SPEED, "Increase Game Speed"); diff --git a/Source/Project64-core/N64System/N64Types.h b/Source/Project64-core/N64System/N64Types.h index 0a4d80bf2..204c9adab 100644 --- a/Source/Project64-core/N64System/N64Types.h +++ b/Source/Project64-core/N64System/N64Types.h @@ -45,7 +45,7 @@ enum CPU_TYPE enum FRAMERATE_TYPE { - FR_VIs = 0, FR_DLs = 1, FR_PERCENT = 2, FR_VIs_DLs = 3, FR_None = 4, + FR_VIs = 0, FR_DLs = 1, FR_PERCENT = 2, FR_VIs_DLs = 3, }; enum SAVE_CHIP_TYPE diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp index fb4cebfe3..9cf394fc8 100644 --- a/Source/Project64-core/Settings.cpp +++ b/Source/Project64-core/Settings.cpp @@ -241,12 +241,8 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) //User Interface AddHandler(UserInterface_ShowCPUPer, new CSettingTypeApplication("Settings", "Display CPU Usage", (uint32_t)false)); -#ifdef ANDROID AddHandler(UserInterface_DisplayFrameRate, new CSettingTypeApplication("Settings", "Display Frame Rate", (uint32_t)false)); -#else - AddHandler(UserInterface_DisplayFrameRate, new CSettingTypeApplication("Settings", "Display Frame Rate", (uint32_t)true)); -#endif - AddHandler(UserInterface_FrameDisplayType, new CSettingTypeApplication("Settings", "Frame Rate Display Type", (uint32_t)FR_None)); + AddHandler(UserInterface_FrameDisplayType, new CSettingTypeApplication("Settings", "Frame Rate Display Type", (uint32_t)FR_VIs)); AddHandler(Directory_Plugin, new CSettingTypeSelectedDirectory("Dir:Plugin", Directory_PluginInitial, Directory_PluginSelected, Directory_PluginUseSelected, Directory_Plugin)); #ifndef _M_X64 AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin", "")); diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-AdvancedOptions.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-AdvancedOptions.cpp index f2085be65..a99b2d375 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-AdvancedOptions.cpp +++ b/Source/Project64/UserInterface/Settings/SettingsPage-AdvancedOptions.cpp @@ -45,9 +45,8 @@ CAdvancedOptionsPage::CAdvancedOptionsPage(HWND hParent, const RECT & rcDispay) ComboBox->AddItemW(wGS(STR_FR_VIS).c_str(), FR_VIs); ComboBox->AddItemW(wGS(STR_FR_DLS).c_str(), FR_DLs); ComboBox->AddItemW(wGS(STR_FR_PERCENT).c_str(), FR_PERCENT); - ComboBox->AddItemW(wGS(STR_FR_DLS_VIS).c_str(), FR_VIs_DLs); - ComboBox->AddItemW(wGS(STR_FR_NONE).c_str(), FR_None); - } + ComboBox->AddItemW(wGS(STR_FR_DLS_VIS).c_str(), FR_VIs_DLs); + } m_IplDir.Attach(GetDlgItem(IDC_IPL_DIR));