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

ESC allows exiting Pause mode, TimeMachine mode and Command Menu.

This commit is contained in:
thrust26 2018-01-19 12:44:07 +01:00
parent 4c9cfad70b
commit 78b807efba
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emucore/EventHandler.cxx
View File

@ -1256,6 +1256,19 @@ bool EventHandler::eventStateChange(Event::Type type)
handled = false; handled = false;
break; break;
case Event::LauncherMode:
if (myState == EventHandlerState::PAUSE ||
myState == EventHandlerState::TIMEMACHINE)
setEventState(EventHandlerState::EMULATION);
else if(myState == EventHandlerState::CMDMENU)
leaveMenuMode();
// TODO: this currently does not work, because it exits all open dialogs too
/*else if(myState == EventHandlerState::DEBUGGER)
leaveDebugMode();*/
else
handled = false;
break;
default: default:
handled = false; handled = false;
} }

1
src/emucore/EventHandler.hxx
View File

@ -473,7 +473,6 @@ class EventHandler
The following methods take care of assigning action mappings. The following methods take care of assigning action mappings.
*/ */
void setActionMappings(EventMode mode); void setActionMappings(EventMode mode);
void setKeyNames();
void setKeymap(); void setKeymap();
void setDefaultKeymap(Event::Type, EventMode mode); void setDefaultKeymap(Event::Type, EventMode mode);
void setDefaultJoymap(Event::Type, EventMode mode); void setDefaultJoymap(Event::Type, EventMode mode);