From 167ceb11b192e41ca3c3531af5b511f666ff211c Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 13 Feb 2015 08:39:27 +1100 Subject: [PATCH] Fix problem where ScreenHertz was not setting based off of RDB by death-droid --- Source/Project64/N64 System/N64 Class.cpp | 4 ++-- Source/Project64/Settings/Settings Class.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index cf2a3d30c..a09fa114a 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -43,8 +43,8 @@ CN64System::CN64System ( CPlugins * Plugins, bool SavesReadOnly ) : m_RspBroke(true), m_SyncCount(0) { - DWORD gameHertz = 60; - if (!g_Settings->LoadDword(Game_ScreenHertz), gameHertz) + DWORD gameHertz = g_Settings->LoadDword(Game_ScreenHertz); + if (gameHertz == 0) { gameHertz = (SystemType() == SYSTEM_PAL) ? 50 : 60; } diff --git a/Source/Project64/Settings/Settings Class.cpp b/Source/Project64/Settings/Settings Class.cpp index 74c7131e0..1cf6d56bd 100644 --- a/Source/Project64/Settings/Settings Class.cpp +++ b/Source/Project64/Settings/Settings Class.cpp @@ -148,7 +148,7 @@ void CSettings::AddHowToHandleSetting () AddHandler(Rdb_UseHleGfx, new CSettingTypeRomDatabase("HLE GFX",Plugin_UseHleGfx)); AddHandler(Rdb_UseHleAudio, new CSettingTypeRomDatabase("HLE Audio",Plugin_UseHleAudio)); AddHandler(Rdb_LoadRomToMemory, new CSettingTypeRomDatabase("Rom In Memory",false)); - AddHandler(Rdb_ScreenHertz, new CSettingTypeRomDatabase("ScreenHertz",60)); + AddHandler(Rdb_ScreenHertz, new CSettingTypeRomDatabase("ScreenHertz",0)); AddHandler(Rdb_FuncLookupMode, new CSettingTypeRomDatabase("FuncFind",FuncFind_PhysicalLookup)); AddHandler(Rdb_RegCache, new CSettingTypeRDBYesNo("Reg Cache",true)); AddHandler(Rdb_BlockLinking, new CSettingTypeRDBOnOff("Linking",true));