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

fixed a little merge error

This commit is contained in:
thrust26 2018-02-05 13:39:13 +01:00
parent f7c445fb7c
commit 33756b2481
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emucore/EventHandler.cxx
View File

@ -301,19 +301,19 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state)
{ {
case KBDK_LEFT: // Alt-left(-shift) rewinds 1(10) states case KBDK_LEFT: // Alt-left(-shift) rewinds 1(10) states
enterTimeMachineMenuMode((StellaModTest::isShift(mod) && state) ? 10 : 1, false); enterTimeMachineMenuMode((StellaModTest::isShift(mod) && state) ? 10 : 1, false);
return; break;
case KBDK_RIGHT: // Alt-right(-shift) unwinds 1(10) states case KBDK_RIGHT: // Alt-right(-shift) unwinds 1(10) states
enterTimeMachineMenuMode((StellaModTest::isShift(mod) && state) ? 10 : 1, true); enterTimeMachineMenuMode((StellaModTest::isShift(mod) && state) ? 10 : 1, true);
return; break;
case KBDK_DOWN: // Alt-down rewinds to start of list case KBDK_DOWN: // Alt-down rewinds to start of list
enterTimeMachineMenuMode(1000, false); enterTimeMachineMenuMode(1000, false);
return; break;
case KBDK_UP: // Alt-up rewinds to end of list case KBDK_UP: // Alt-up rewinds to end of list
enterTimeMachineMenuMode(1000, true); enterTimeMachineMenuMode(1000, true);
return; break;
// These can work in pause mode too // These can work in pause mode too
case KBDK_EQUALS: case KBDK_EQUALS:
@ -2151,8 +2151,6 @@ void EventHandler::enterTimeMachineMenuMode(uInt32 numWinds, bool unwind)
// add one extra state if we are in Time Machine mode // add one extra state if we are in Time Machine mode
// TODO: maybe remove this state if we leave the menu at this new state // TODO: maybe remove this state if we leave the menu at this new state
myOSystem.state().addExtraState("enter Time Machine dialog"); // force new state myOSystem.state().addExtraState("enter Time Machine dialog"); // force new state
if(numWinds)
myOSystem.state().windStates(numWinds, unwind);
if(numWinds) if(numWinds)
myOSystem.state().windStates(numWinds, unwind); myOSystem.state().windStates(numWinds, unwind);