Revert "Fix for the interframe-pause-skips-updating-next-frame bugs, mostly noticeable when dumping AVIs."
This reverts commit c7710ae244
.
fixes #39
This commit is contained in:
parent
e72202f3b8
commit
abed13c392
|
@ -2200,7 +2200,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
|
||||||
//mbg merge 7/18/06 changed pausing check and set
|
//mbg merge 7/18/06 changed pausing check and set
|
||||||
if (FCEUI_EmulationPaused()) {
|
if (FCEUI_EmulationPaused()) {
|
||||||
UpdateRegs(hwndDlg);
|
UpdateRegs(hwndDlg);
|
||||||
FCEUI_SetEmulationPaused(0);
|
FCEUI_ToggleEmulationPause();
|
||||||
//DebuggerWasUpdated = false done in above function;
|
//DebuggerWasUpdated = false done in above function;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
11
src/fceu.cpp
11
src/fceu.cpp
|
@ -112,7 +112,6 @@ bool movieSubtitles = true; //Toggle for displaying movie subtitles
|
||||||
bool DebuggerWasUpdated = false; //To prevent the debugger from updating things without being updated.
|
bool DebuggerWasUpdated = false; //To prevent the debugger from updating things without being updated.
|
||||||
bool AutoResumePlay = false;
|
bool AutoResumePlay = false;
|
||||||
char romNameWhenClosingEmulator[2048] = {0};
|
char romNameWhenClosingEmulator[2048] = {0};
|
||||||
bool togglePausedRequested = false; //Flaged true to pause at frame boundary
|
|
||||||
|
|
||||||
FCEUGI::FCEUGI()
|
FCEUGI::FCEUGI()
|
||||||
: filename(0),
|
: filename(0),
|
||||||
|
@ -660,14 +659,6 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
|
||||||
|
|
||||||
JustFrameAdvanced = false;
|
JustFrameAdvanced = false;
|
||||||
|
|
||||||
//do pausing at frame boundary to avoid inconsistency
|
|
||||||
if (togglePausedRequested)
|
|
||||||
{
|
|
||||||
togglePausedRequested = false;
|
|
||||||
if (!frameAdvanceRequested)
|
|
||||||
EmulationPaused ^= EMULATIONPAUSED_PAUSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (frameAdvanceRequested)
|
if (frameAdvanceRequested)
|
||||||
{
|
{
|
||||||
if (frameAdvance_Delay_count == 0 || frameAdvance_Delay_count >= frameAdvance_Delay)
|
if (frameAdvance_Delay_count == 0 || frameAdvance_Delay_count >= frameAdvance_Delay)
|
||||||
|
@ -1133,7 +1124,7 @@ void FCEUI_SetEmulationPaused(int val) {
|
||||||
|
|
||||||
void FCEUI_ToggleEmulationPause(void)
|
void FCEUI_ToggleEmulationPause(void)
|
||||||
{
|
{
|
||||||
togglePausedRequested = true;;
|
EmulationPaused = (EmulationPaused & EMULATIONPAUSED_PAUSED) ^ EMULATIONPAUSED_PAUSED;
|
||||||
DebuggerWasUpdated = false;
|
DebuggerWasUpdated = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue