From b8d3cae6e327fae1d5bc28bcc86b4aca765fbf73 Mon Sep 17 00:00:00 2001 From: death2droid Date: Fri, 12 Jun 2009 13:21:54 +0000 Subject: [PATCH] Dolphin now saves frame limiter setting. Info Window now also gets the frame limiter setting :P git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3408 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 -- Source/Core/DolphinWX/Src/Summarize.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 663b7bbe5c..cf3574bd39 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -120,6 +120,7 @@ void SConfig::SaveSettings() ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer); ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient); + ini.Set("Core", "FrameLimit", m_InterfaceFramelimit); // Wii ini.Set("Wii", "Widescreen", m_LocalCoreStartupParameter.bWidescreen); @@ -236,6 +237,7 @@ void SConfig::LoadSettings() ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "TLBHack", &m_LocalCoreStartupParameter.iTLBHack, 0); + ini.Get("Core", "FrameLimit", &m_InterfaceFramelimit,0); // Wii ini.Get("Wii", "Widescreen", &m_LocalCoreStartupParameter.bWidescreen, false); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 0361df6ba6..1956c67c2a 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -657,9 +657,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) break; case ID_INTERFACE_FRAMELIMIT: SConfig::GetInstance().m_InterfaceFramelimit = (u32)InterfaceFramelimit->GetSelection(); - bRefreshList = true; break; - case ID_ALLWAYS_HLEBIOS: // Core SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios = AlwaysUseHLEBIOS->IsChecked(); break; diff --git a/Source/Core/DolphinWX/Src/Summarize.h b/Source/Core/DolphinWX/Src/Summarize.h index 1fae2c611a..2de507d1dc 100644 --- a/Source/Core/DolphinWX/Src/Summarize.h +++ b/Source/Core/DolphinWX/Src/Summarize.h @@ -71,6 +71,7 @@ std::string Summarize_Settings() "Run Compare Server: %s\n" "Run Compare Client: %s\n" "TLB Hack: %s\n" + "Frame Limit: %d\n" "[Wii]Widescreen: %s\n" "[Wii]Progressive Scan: %s\n", Core::GetStartupParameter().bHLEBios?"True":"False", @@ -93,6 +94,7 @@ std::string Summarize_Settings() Core::GetStartupParameter().bRunCompareServer?"True":"False", Core::GetStartupParameter().bRunCompareClient?"True":"False", Core::GetStartupParameter().iTLBHack?"True":"False", + SConfig::GetInstance().m_InterfaceFramelimit*5, Core::GetStartupParameter().bWidescreen?"True":"False", Core::GetStartupParameter().bProgressiveScan?"True":"False" );