Prevent HWEvents from firing when setting cheats

tooncoon · Mar 28, 2012 · da4829e · da4829e
1 parent 9cc05b3
commit da4829e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cheats2.cpp b/cheats2.cpp
@@ -186,20 +186,26 @@ static void S9xSetByteFree (uint8, uint32);
 
 static uint8 S9xGetByteFree (uint32 address)
 {
-	uint32	Cycles = CPU.Cycles;
+	int32	Cycles = CPU.Cycles;
+    int32   NextEvent = CPU.NextEvent;
 	uint8	byte;
 
+    CPU.NextEvent = 0x7FFFFFFF;
 	byte = S9xGetByte(address);
+    CPU.NextEvent = NextEvent;
 	CPU.Cycles = Cycles;
 
 	return (byte);
 }
 
 static void S9xSetByteFree (uint8 byte, uint32 address)
 {
-	uint32	Cycles = CPU.Cycles;
+	int32	Cycles = CPU.Cycles;
+    int32  NextEvent = CPU.NextEvent;
 
+    CPU.NextEvent = 0x7FFFFFFF;
 	S9xSetByte(byte, address);
+    CPU.NextEvent = NextEvent;
 	CPU.Cycles = Cycles;
 }