From fe855ad5da34442ea9c07a3e2feeb4bdac18756b Mon Sep 17 00:00:00 2001 From: Azimer Date: Tue, 5 May 2015 11:46:25 -0500 Subject: [PATCH 1/2] Revert DoSomething from bool to BOOL #2 This fixes the interpreter --- Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp index 3fa6426d5..df48dd355 100644 --- a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp +++ b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp @@ -268,7 +268,7 @@ void CInterpreterCPU::ExecuteCPU() OPCODE & Opcode = R4300iOp::m_Opcode; DWORD & JumpToLocation = R4300iOp::m_JumpToLocation; bool & TestTimer = R4300iOp::m_TestTimer; - const bool & bDoSomething= g_SystemEvents->DoSomething(); + const BOOL & bDoSomething= g_SystemEvents->DoSomething(); DWORD CountPerOp = g_System->CountPerOp(); int & NextTimer = *g_NextTimer; From f48d645f83b8449e22f44d516b125086c60de71e Mon Sep 17 00:00:00 2001 From: Azimer Date: Tue, 5 May 2015 17:49:06 -0500 Subject: [PATCH 2/2] Missed a DoSomething --- Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp index df48dd355..a94c8283b 100644 --- a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp +++ b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp @@ -354,7 +354,7 @@ void CInterpreterCPU::ExecuteOps(int Cycles) OPCODE & Opcode = R4300iOp::m_Opcode; DWORD & JumpToLocation = R4300iOp::m_JumpToLocation; bool & TestTimer = R4300iOp::m_TestTimer; - const bool & DoSomething = g_SystemEvents->DoSomething(); + const BOOL & DoSomething = g_SystemEvents->DoSomething(); DWORD CountPerOp = g_System->CountPerOp(); __try