aboutsummaryrefslogtreecommitdiff
path: root/engines/cine/various.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2006-04-11 23:31:03 +0000
committerEugene Sandulenko2006-04-11 23:31:03 +0000
commit83d75e119ff48f0c26fc6a14098444c6b86d4725 (patch)
treed0cb292730e733b3e465ef132c0aff02fe52c5df /engines/cine/various.cpp
parent24b2f65f91eacb442cd2a13ecec3e7916655a82e (diff)
downloadscummvm-rg350-83d75e119ff48f0c26fc6a14098444c6b86d4725.tar.gz
scummvm-rg350-83d75e119ff48f0c26fc6a14098444c6b86d4725.tar.bz2
scummvm-rg350-83d75e119ff48f0c26fc6a14098444c6b86d4725.zip
Add F1-F10 keymappings like in original engine.
svn-id: r21815
Diffstat (limited to 'engines/cine/various.cpp')
-rw-r--r--engines/cine/various.cpp31
1 files changed, 20 insertions, 11 deletions
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 11252a88c6..51247778e8 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -1797,6 +1797,25 @@ void drawMenuBox(char *command, int16 x, int16 y) {
gfxFuncGen2();
}
+void makeActionMenu(void) {
+ uint16 mouseButton;
+ uint16 mouseX;
+ uint16 mouseY;
+
+ getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
+
+ if (gameType == Cine::GID_OS) {
+ playerCommand = makeMenuChoice2(defaultActionCommand, 6, mouseX, mouseY, 70);
+
+ if (playerCommand >= 8000) {
+ playerCommand -= 8000;
+ canUseOnObject = 1;
+ }
+ } else {
+ playerCommand = makeMenuChoice(defaultActionCommand, 6, mouseX, mouseY, 70);
+ }
+}
+
uint16 executePlayerInput(void) {
uint16 var_5E;
uint16 var_2;
@@ -1896,17 +1915,7 @@ uint16 executePlayerInput(void) {
makeSystemMenu();
}
- if (gameType == Cine::GID_OS) {
- playerCommand = makeMenuChoice2(defaultActionCommand, 6, mouseX, mouseY, 70);
-
- if (playerCommand >= 8000) {
- playerCommand -= 8000;
- canUseOnObject = 1;
- }
- } else {
- playerCommand = makeMenuChoice(defaultActionCommand, 6, mouseX, mouseY, 70);
- }
-
+ makeActionMenu();
makeCommandLine();
} else {
int16 objIdx;