From d9e13d4385a53a1b43440e904dbdc3235d66bba8 Mon Sep 17 00:00:00 2001 From: zilmar Date: Sun, 15 Nov 2015 08:14:37 +1100 Subject: [PATCH] [Project64] Cleanup Game Settings.cpp --- Source/Project64/Settings/Game Settings.cpp | 78 +++++++-------- Source/Project64/Settings/Game Settings.h | 100 ++++++++++---------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/Source/Project64/Settings/Game Settings.cpp b/Source/Project64/Settings/Game Settings.cpp index 8dc1d2e05..76ba4fd24 100644 --- a/Source/Project64/Settings/Game Settings.cpp +++ b/Source/Project64/Settings/Game Settings.cpp @@ -10,11 +10,11 @@ ****************************************************************************/ #include "stdafx.h" -bool CGameSettings::m_bSMM_StoreInstruc; -bool CGameSettings::m_bSMM_Protect; +bool CGameSettings::m_bSMM_StoreInstruc; +bool CGameSettings::m_bSMM_Protect; bool CGameSettings::m_bSMM_ValidFunc; -bool CGameSettings::m_bSMM_PIDMA; -bool CGameSettings::m_bSMM_TLB; +bool CGameSettings::m_bSMM_PIDMA; +bool CGameSettings::m_bSMM_TLB; bool CGameSettings::m_bUseTlb; DWORD CGameSettings::m_CountPerOp = 2; DWORD CGameSettings::m_ViRefreshRate = 1500; @@ -22,9 +22,9 @@ DWORD CGameSettings::m_AiCountPerBytes = 500; bool CGameSettings::m_DelayDP = false; bool CGameSettings::m_DelaySI = false; DWORD CGameSettings::m_RdramSize = 0; -bool CGameSettings::m_bFixedAudio = true; -bool CGameSettings::m_bSyncingToAudio = true; -bool CGameSettings::m_bSyncToAudio = true; +bool CGameSettings::m_bFixedAudio = true; +bool CGameSettings::m_bSyncingToAudio = true; +bool CGameSettings::m_bSyncToAudio = true; bool CGameSettings::m_bFastSP = true; bool CGameSettings::m_b32Bit = true; bool CGameSettings::m_RspAudioSignal; @@ -37,39 +37,39 @@ CPU_TYPE CGameSettings::m_CpuType = CPU_Recompiler; void CGameSettings::RefreshGameSettings() { - m_bSMM_StoreInstruc = false /*g_Settings->LoadBool(Game_SMM_StoreInstruc)*/; - m_bSMM_Protect = g_Settings->LoadBool(Game_SMM_Protect); - m_bSMM_ValidFunc = g_Settings->LoadBool(Game_SMM_ValidFunc); - m_bSMM_PIDMA = g_Settings->LoadBool(Game_SMM_PIDMA); - m_bSMM_TLB = g_Settings->LoadBool(Game_SMM_TLB); - m_bUseTlb = g_Settings->LoadBool(Game_UseTlb); - m_ViRefreshRate = g_Settings->LoadDword(Game_ViRefreshRate); - m_AiCountPerBytes = g_Settings->LoadDword(Game_AiCountPerBytes); - m_CountPerOp = g_Settings->LoadDword(Game_CounterFactor); - m_RdramSize = g_Settings->LoadDword(Game_RDRamSize); - m_DelaySI = g_Settings->LoadBool(Game_DelaySI); - m_DelayDP = g_Settings->LoadBool(Game_DelayDP); - m_bFixedAudio = g_Settings->LoadBool(Game_FixedAudio); - m_bSyncToAudio = m_bFixedAudio ? g_Settings->LoadBool(Game_SyncViaAudio) : false; - m_b32Bit = g_Settings->LoadBool(Game_32Bit); - m_bFastSP = g_Settings->LoadBool(Game_FastSP); - m_RspAudioSignal = g_Settings->LoadBool(Game_RspAudioSignal); - m_bRomInMemory = g_Settings->LoadBool(Game_LoadRomToMemory); - m_RegCaching = g_Settings->LoadBool(Game_RegCache); - m_bLinkBlocks = g_Settings->LoadBool(Game_BlockLinking); - m_LookUpMode = g_Settings->LoadDword(Game_FuncLookupMode); - m_SystemType = (SYSTEM_TYPE)g_Settings->LoadDword(Game_SystemType); - m_CpuType = (CPU_TYPE)g_Settings->LoadDword(Game_CpuType); + m_bSMM_StoreInstruc = false /*g_Settings->LoadBool(Game_SMM_StoreInstruc)*/; + m_bSMM_Protect = g_Settings->LoadBool(Game_SMM_Protect); + m_bSMM_ValidFunc = g_Settings->LoadBool(Game_SMM_ValidFunc); + m_bSMM_PIDMA = g_Settings->LoadBool(Game_SMM_PIDMA); + m_bSMM_TLB = g_Settings->LoadBool(Game_SMM_TLB); + m_bUseTlb = g_Settings->LoadBool(Game_UseTlb); + m_ViRefreshRate = g_Settings->LoadDword(Game_ViRefreshRate); + m_AiCountPerBytes = g_Settings->LoadDword(Game_AiCountPerBytes); + m_CountPerOp = g_Settings->LoadDword(Game_CounterFactor); + m_RdramSize = g_Settings->LoadDword(Game_RDRamSize); + m_DelaySI = g_Settings->LoadBool(Game_DelaySI); + m_DelayDP = g_Settings->LoadBool(Game_DelayDP); + m_bFixedAudio = g_Settings->LoadBool(Game_FixedAudio); + m_bSyncToAudio = m_bFixedAudio ? g_Settings->LoadBool(Game_SyncViaAudio) : false; + m_b32Bit = g_Settings->LoadBool(Game_32Bit); + m_bFastSP = g_Settings->LoadBool(Game_FastSP); + m_RspAudioSignal = g_Settings->LoadBool(Game_RspAudioSignal); + m_bRomInMemory = g_Settings->LoadBool(Game_LoadRomToMemory); + m_RegCaching = g_Settings->LoadBool(Game_RegCache); + m_bLinkBlocks = g_Settings->LoadBool(Game_BlockLinking); + m_LookUpMode = g_Settings->LoadDword(Game_FuncLookupMode); + m_SystemType = (SYSTEM_TYPE)g_Settings->LoadDword(Game_SystemType); + m_CpuType = (CPU_TYPE)g_Settings->LoadDword(Game_CpuType); - m_bSyncingToAudio = m_bSyncToAudio; - if (m_CountPerOp == 0) - { - m_CountPerOp = 2; - } + m_bSyncingToAudio = m_bSyncToAudio; + if (m_CountPerOp == 0) + { + m_CountPerOp = 2; + } } -void CGameSettings::SpeedChanged (int SpeedLimit ) +void CGameSettings::SpeedChanged(int SpeedLimit) { - int FullSpeed = g_System->m_SystemType == SYSTEM_PAL ? 50 : 60; - m_bSyncingToAudio = SpeedLimit == FullSpeed ? m_bSyncToAudio : false; -} + int FullSpeed = g_System->m_SystemType == SYSTEM_PAL ? 50 : 60; + m_bSyncingToAudio = SpeedLimit == FullSpeed ? m_bSyncToAudio : false; +} \ No newline at end of file diff --git a/Source/Project64/Settings/Game Settings.h b/Source/Project64/Settings/Game Settings.h index f898dde78..0ac44f7d8 100644 --- a/Source/Project64/Settings/Game Settings.h +++ b/Source/Project64/Settings/Game Settings.h @@ -15,59 +15,59 @@ class CGameSettings { public: - void RefreshGameSettings ( void ); + void RefreshGameSettings(void); - inline static bool bRomInMemory ( void ) { return m_bRomInMemory; } - inline static bool bRegCaching ( void ) { return m_RegCaching; } - inline static bool bLinkBlocks ( void ) { return m_bLinkBlocks; } - inline static FUNC_LOOKUP_METHOD LookUpMode ( void ) { return (FUNC_LOOKUP_METHOD)m_LookUpMode; } - inline static bool bUseTlb ( void ) { return m_bUseTlb; } - inline static DWORD CountPerOp ( void ) { return m_CountPerOp; } - inline static DWORD ViRefreshRate ( void ) { return m_ViRefreshRate; } - inline static DWORD AiCountPerBytes ( void ) { return m_AiCountPerBytes; } - inline static bool bDelayDP ( void ) { return m_DelayDP; } - inline static bool bDelaySI ( void ) { return m_DelaySI; } - inline static DWORD RdramSize ( void ) { return m_RdramSize; } - inline static bool bFixedAudio ( void ) { return m_bFixedAudio; } - inline static bool bSyncToAudio ( void ) { return m_bSyncingToAudio; } - inline static bool bFastSP ( void ) { return m_bFastSP; } - inline static bool b32BitCore ( void ) { return m_b32Bit; } - inline static bool RspAudioSignal ( void ) { return m_RspAudioSignal; } - inline static bool bSMM_StoreInstruc ( void ) { return m_bSMM_StoreInstruc; } - inline static bool bSMM_Protect ( void ) { return m_bSMM_Protect; } - inline static bool bSMM_ValidFunc ( void ) { return m_bSMM_ValidFunc; } - inline static bool bSMM_PIDMA ( void ) { return m_bSMM_PIDMA; } - inline static bool bSMM_TLB ( void ) { return m_bSMM_TLB; } - inline static SYSTEM_TYPE SystemType ( void ) { return m_SystemType; } - inline static CPU_TYPE CpuType ( void ) { return m_CpuType; } + inline static bool bRomInMemory(void) { return m_bRomInMemory; } + inline static bool bRegCaching(void) { return m_RegCaching; } + inline static bool bLinkBlocks(void) { return m_bLinkBlocks; } + inline static FUNC_LOOKUP_METHOD LookUpMode(void) { return (FUNC_LOOKUP_METHOD)m_LookUpMode; } + inline static bool bUseTlb(void) { return m_bUseTlb; } + inline static DWORD CountPerOp(void) { return m_CountPerOp; } + inline static DWORD ViRefreshRate(void) { return m_ViRefreshRate; } + inline static DWORD AiCountPerBytes(void) { return m_AiCountPerBytes; } + inline static bool bDelayDP(void) { return m_DelayDP; } + inline static bool bDelaySI(void) { return m_DelaySI; } + inline static DWORD RdramSize(void) { return m_RdramSize; } + inline static bool bFixedAudio(void) { return m_bFixedAudio; } + inline static bool bSyncToAudio(void) { return m_bSyncingToAudio; } + inline static bool bFastSP(void) { return m_bFastSP; } + inline static bool b32BitCore(void) { return m_b32Bit; } + inline static bool RspAudioSignal(void) { return m_RspAudioSignal; } + inline static bool bSMM_StoreInstruc(void) { return m_bSMM_StoreInstruc; } + inline static bool bSMM_Protect(void) { return m_bSMM_Protect; } + inline static bool bSMM_ValidFunc(void) { return m_bSMM_ValidFunc; } + inline static bool bSMM_PIDMA(void) { return m_bSMM_PIDMA; } + inline static bool bSMM_TLB(void) { return m_bSMM_TLB; } + inline static SYSTEM_TYPE SystemType(void) { return m_SystemType; } + inline static CPU_TYPE CpuType(void) { return m_CpuType; } protected: - static void SpeedChanged (int SpeedLimit ); + static void SpeedChanged(int SpeedLimit); private: - //Settings that can be changed on the fly - static bool m_bRomInMemory; - static bool m_RegCaching; - static bool m_bLinkBlocks; - static DWORD m_LookUpMode; //FUNC_LOOKUP_METHOD - static bool m_bUseTlb; - static DWORD m_CountPerOp; - static DWORD m_ViRefreshRate; - static DWORD m_AiCountPerBytes; - static bool m_DelayDP; - static bool m_DelaySI; - static DWORD m_RdramSize; - static bool m_bFixedAudio; - static bool m_bSyncingToAudio; - static bool m_bSyncToAudio; - static bool m_bFastSP; - static bool m_b32Bit; - static bool m_RspAudioSignal; - static bool m_bSMM_StoreInstruc; - static bool m_bSMM_Protect; - static bool m_bSMM_ValidFunc; - static bool m_bSMM_PIDMA; - static bool m_bSMM_TLB; - static SYSTEM_TYPE m_SystemType; - static CPU_TYPE m_CpuType; + //Settings that can be changed on the fly + static bool m_bRomInMemory; + static bool m_RegCaching; + static bool m_bLinkBlocks; + static DWORD m_LookUpMode; //FUNC_LOOKUP_METHOD + static bool m_bUseTlb; + static DWORD m_CountPerOp; + static DWORD m_ViRefreshRate; + static DWORD m_AiCountPerBytes; + static bool m_DelayDP; + static bool m_DelaySI; + static DWORD m_RdramSize; + static bool m_bFixedAudio; + static bool m_bSyncingToAudio; + static bool m_bSyncToAudio; + static bool m_bFastSP; + static bool m_b32Bit; + static bool m_RspAudioSignal; + static bool m_bSMM_StoreInstruc; + static bool m_bSMM_Protect; + static bool m_bSMM_ValidFunc; + static bool m_bSMM_PIDMA; + static bool m_bSMM_TLB; + static SYSTEM_TYPE m_SystemType; + static CPU_TYPE m_CpuType; };