From d827bb27fc44233ec8d9f8ccaff2eebe64e7f9e0 Mon Sep 17 00:00:00 2001 From: zilmar Date: Sun, 20 Jan 2013 17:13:24 +1100 Subject: [PATCH] Mips System: Reset timer after reg init --- Source/Project64/N64 System/N64 Class.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index 423d549a6..2246efb3b 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -515,9 +515,6 @@ void CN64System::Reset (bool bInitReg, bool ClearMenory) m_UnknownCount = 0; m_DMAUsed = false; - m_SystemTimer.Reset(); - m_SystemTimer.SetTimer(CSystemTimer::CompareTimer,m_Reg.COMPARE_REGISTER - m_Reg.COUNT_REGISTER,false); - for (int i = 0, n = (sizeof(m_LastSuccessSyncPC)/sizeof(m_LastSuccessSyncPC[0])); i < n; i++) { m_LastSuccessSyncPC[i] = 0; @@ -535,6 +532,10 @@ void CN64System::Reset (bool bInitReg, bool ClearMenory) } else { m_Reg.Reset(); } + + m_SystemTimer.Reset(); + m_SystemTimer.SetTimer(CSystemTimer::CompareTimer,m_Reg.COMPARE_REGISTER - m_Reg.COUNT_REGISTER,false); + if (m_Recomp) { m_Recomp->Reset();