libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

STARK: Bind returning to previous screen to key Esc

Browse Source
This commit is contained in:
Douglas Liu 2018-07-14 15:57:18 +08:00
parent 09b67ae045
commit 180294c02f
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engines/stark/services/userinterface.cpp
View File

@ -144,6 +144,23 @@ void UserInterface::handleDoubleClick() {
_currentScreen->handleDoubleClick();
}
void UserInterface::handleEscape() {
bool handled = false;
handled = StarkGameInterface->skipCurrentSpeeches();
if (!handled) {
handled = skipFMV();
}
if (!handled) {
Screen::Name curScreenName = _currentScreen->getName();
if (curScreenName != Screen::kScreenGame && curScreenName != Screen::kScreenMainMenu) {
backPrevScreen();
} else if (StarkSettings->getBoolSetting(Settings::kTimeSkip)) {
StarkGlobal->setFastForward();
}
}
}
void UserInterface::inventoryOpen(bool open) {
// Make the inventory update its contents.
if (open) {

1
engines/stark/services/userinterface.h
View File

@ -74,6 +74,7 @@ public:
void handleClick();
void handleRightClick();
void handleDoubleClick();
void handleEscape();
void notifyShouldExit() { _exitGame = true; }
void inventoryOpen(bool open);
bool shouldExit() { return _exitGame; }

9
engines/stark/stark.cpp
View File

@ -218,14 +218,7 @@ void StarkEngine::processEvents() {
_console->onFrame();
}
} else if (e.kbd.keycode == Common::KEYCODE_ESCAPE) {
// Quick-hack for now.
bool skipped = _gameInterface->skipCurrentSpeeches();
if (!skipped) {
skipped = _userInterface->skipFMV();
}
if (!skipped && StarkSettings->getBoolSetting(Settings::kTimeSkip)) {
_global->setFastForward();
}
_userInterface->handleEscape();
} else if ((e.kbd.keycode == Common::KEYCODE_RETURN
|| e.kbd.keycode == Common::KEYCODE_KP_ENTER)) {
if (e.kbd.hasFlags(Common::KBD_ALT)) {