aboutsummaryrefslogtreecommitdiff
path: root/source/nds/entry.cpp
diff options
context:
space:
mode:
authorNebuleon Fumika2013-01-19 02:24:37 -0500
committerNebuleon Fumika2013-01-19 02:24:37 -0500
commit2bb2ee8c0aee044998858ff8263be71cb908a663 (patch)
treee350afccb07324962f773e5372254e4da31d7e99 /source/nds/entry.cpp
parent71a57cc449a42721eb0cd90cab07c57bbd9c9512 (diff)
downloadsnes9x2005-2bb2ee8c0aee044998858ff8263be71cb908a663.tar.gz
snes9x2005-2bb2ee8c0aee044998858ff8263be71cb908a663.tar.bz2
snes9x2005-2bb2ee8c0aee044998858ff8263be71cb908a663.zip
Prepare code to ask for a hotkey. Prepare a temporary fast-forward switch.
Diffstat (limited to 'source/nds/entry.cpp')
-rw-r--r--source/nds/entry.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/nds/entry.cpp b/source/nds/entry.cpp
index 7852bc9..1fb5bd8 100644
--- a/source/nds/entry.cpp
+++ b/source/nds/entry.cpp
@@ -588,8 +588,6 @@ static unsigned int sync_last= 0;
static unsigned int sync_next = 0;
static unsigned int auto_equivalent_skip = 0;
-extern "C" u32 game_fast_forward;
-
static unsigned int skip_rate= 0;
void S9xSyncSpeed ()
@@ -607,7 +605,7 @@ void S9xSyncSpeed ()
#endif
syncnow = getSysTime();
- if (game_fast_forward)
+ if (game_fast_forward || temporary_fast_forward /* hotkey is held */)
{
sync_last = syncnow;
sync_next = syncnow;
@@ -620,7 +618,7 @@ void S9xSyncSpeed ()
IPPU.RenderThisFrame = true;
}
}
- else if (Settings.SkipFrames == AUTO_FRAMERATE /* && !game_fast_forward */)
+ else if (Settings.SkipFrames == AUTO_FRAMERATE /* && !game_fast_forward && !temporary_fast_forward */)
{
// frame_time is in getSysTime units: 42.667 microseconds.
int32 frame_time = Settings.PAL ? 468 /* = 20.0 ms */ : 391 /* = 16.67 ms */;
@@ -701,7 +699,7 @@ void S9xSyncSpeed ()
}
#endif
}
- else /* if (Settings.SkipFrames != AUTO_FRAMERATE && !game_fast_forward) */
+ else /* if (Settings.SkipFrames != AUTO_FRAMERATE && !game_fast_forward && !temporary_fast_forward) */
{
// frame_time is in getSysTime units: 42.667 microseconds.
uint32 frame_time = Settings.PAL ? 468 /* = 20.0 ms */ : 391 /* = 16.67 ms */;