aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/menu.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2019-05-27 19:11:10 +0300
committerFilippos Karapetis2019-05-27 19:11:10 +0300
commit88855082373113a4fad3745006a9efc261051a26 (patch)
tree3afc21dc54f2f6fe1483e9b3ec3986dafb17601d /engines/startrek/menu.cpp
parentb0699f703eeaa02d0df172380bcdad2f207e330a (diff)
downloadscummvm-rg350-88855082373113a4fad3745006a9efc261051a26.tar.gz
scummvm-rg350-88855082373113a4fad3745006a9efc261051a26.tar.bz2
scummvm-rg350-88855082373113a4fad3745006a9efc261051a26.zip
STARTREK: Refactor code to remove more gotos
Diffstat (limited to 'engines/startrek/menu.cpp')
-rw-r--r--engines/startrek/menu.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/startrek/menu.cpp b/engines/startrek/menu.cpp
index a4a37394bf..72b72d94b5 100644
--- a/engines/startrek/menu.cpp
+++ b/engines/startrek/menu.cpp
@@ -337,7 +337,6 @@ int StarTrekEngine::showActionMenu() {
break;
case TREKEVENT_LBUTTONDOWN:
-selectAndExit:
displayMenu = false;
addEventBack = true;
break;
@@ -404,7 +403,9 @@ exitMenu:
case Common::KEYCODE_RETURN:
case Common::KEYCODE_KP_ENTER:
case Common::KEYCODE_F1: // Exit menu with whatever is selected
- goto selectAndExit;
+ displayMenu = false;
+ addEventBack = true;
+ break;
case Common::KEYCODE_PAGEUP:
case Common::KEYCODE_KP9: