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

preventing frameskip from affecting frame advance except when also fast-forwarding, and fixing a bug where the very first frame advance would not pause the game

This commit is contained in:
nitsuja 2009-11-08 02:30:42 +00:00
parent 89e4e948c3
commit d7d3e9f21b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/NDSSystem.h
View File

@ -366,6 +366,7 @@ void NDS_Sleep();
void NDS_SkipNextFrame(); void NDS_SkipNextFrame();
#define NDS_SkipFrame(s) if(s) NDS_SkipNext2DFrame(); #define NDS_SkipFrame(s) if(s) NDS_SkipNext2DFrame();
void NDS_OmitFrameSkip(int force=0);
void execHardware_doAllDma(EDMAMode modeNum); void execHardware_doAllDma(EDMAMode modeNum);

16
desmume/src/windows/main.cpp
View File

@ -292,6 +292,7 @@ int frameskiprate=0;
int lastskiprate=0; int lastskiprate=0;
int emu_paused = 0; int emu_paused = 0;
bool frameAdvance = false; bool frameAdvance = false;
bool continuousframeAdvancing = false;
bool staterewindingenabled = false; bool staterewindingenabled = false;
unsigned short windowSize = 0; unsigned short windowSize = 0;
@ -1576,7 +1577,7 @@ static void StepRunLoop_Throttle(bool allowSleep = true, int forceFrameSkip = -1
mainLoopData.framestoskip = 0; // otherwise switches to lower frameskip rates will lag behind mainLoopData.framestoskip = 0; // otherwise switches to lower frameskip rates will lag behind
} }
if(!mainLoopData.skipnextframe || forceFrameSkip == 0) if(!mainLoopData.skipnextframe || forceFrameSkip == 0 || frameAdvance || (continuousframeAdvancing && !FastForward))
{ {
mainLoopData.framesskipped = 0; mainLoopData.framesskipped = 0;
@ -1647,13 +1648,13 @@ static void StepRunLoop_Throttle(bool allowSleep = true, int forceFrameSkip = -1
emu_halt(); emu_halt();
SPU_Pause(1); SPU_Pause(1);
} }
ServiceDisplayThreadInvocations();
if(execute && emu_paused && !frameAdvance) if(execute && emu_paused && !frameAdvance)
{ {
// safety net against running out of control in case this ever happens. // safety net against running out of control in case this ever happens.
Unpause(); Pause(); Unpause(); Pause();
} }
ServiceDisplayThreadInvocations();
} }
DWORD WINAPI run() DWORD WINAPI run()
@ -3292,10 +3293,11 @@ void TogglePause()
} }
bool first; bool first = true;
void FrameAdvance(bool state) void FrameAdvance(bool state)
{ {
continuousframeAdvancing = false;
if(!romloaded) if(!romloaded)
return; return;
if(state) { if(state) {
@ -3310,11 +3312,17 @@ void FrameAdvance(bool state)
execute = TRUE; execute = TRUE;
frameAdvance = true; frameAdvance = true;
} }
// this seems to reduce the average recovery time (by about 1 frame)
// when switching from frameskipping to frameadvance.
// we could pass 1 in to force it to happen even earlier
// but that can result in 2d and 3d looking out of sync for 1 frame.
NDS_OmitFrameSkip();
} else { } else {
// frame advance button still held down, // frame advance button still held down,
// start or continue executing at normal speed // start or continue executing at normal speed
Unpause(); Unpause();
frameAdvance = false; frameAdvance = false;
continuousframeAdvancing = true;
} }
} else { } else {
// frame advance button released // frame advance button released