ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Also break out of S9xMainLoop in original location." 

This reverts commit 8313c51e81.
This commit is contained in:
Brandon Wright 2017-11-24 14:01:05 -06:00
parent 8313c51e81
commit 76e25cbb6f
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpuexec.cpp
View File

@ -204,7 +204,6 @@
static inline void S9xReschedule (void); static inline void S9xReschedule (void);
static int endframe = 0;
void S9xMainLoop (void) void S9xMainLoop (void)
{ {
@ -315,15 +314,13 @@ void S9xMainLoop (void)
S9xPackStatus(); S9xPackStatus();
CPU.Flags &= ~SCAN_KEYS_FLAG; if (CPU.Flags & SCAN_KEYS_FLAG)
if (endframe)
{ {
#ifdef DEBUGGER #ifdef DEBUGGER
if (!(CPU.Flags & FRAME_ADVANCE_FLAG)) if (!(CPU.Flags & FRAME_ADVANCE_FLAG))
#endif #endif
S9xSyncSpeed(); S9xSyncSpeed();
endframe = 0; CPU.Flags &= ~SCAN_KEYS_FLAG;
} }
} }
@ -446,9 +443,7 @@ void S9xDoHEventProcessing (void)
Timings.NMITriggerPos = 0xffff; Timings.NMITriggerPos = 0xffff;
ICPU.Frame++; ICPU.Frame++;
endframe = 1;
PPU.HVBeamCounterLatched = 0; PPU.HVBeamCounterLatched = 0;
CPU.Flags |= SCAN_KEYS_FLAG;
} }
// From byuu: // From byuu: