aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/script.cpp8
-rw-r--r--scumm/scummvm.cpp5
2 files changed, 9 insertions, 4 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 7cb994ee15..1ab646673e 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -771,9 +771,11 @@ void Scumm::runInputScript(int a, int cmd, int mode) {
int args[16];
int verbScript;
- if (_features & GF_AFTER_V2)
- verbScript = 2;
- else
+ if (_features & GF_AFTER_V2) {
+ verbScript = 4;
+ if (a == 1) // Verb clicked
+ _scummVars[33] = cmd;
+ } else
verbScript = VAR(VAR_VERB_SCRIPT);
memset(args, 0, sizeof(args));
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 01cccc0723..66c943aca4 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1733,7 +1733,10 @@ void Scumm::processKbd() {
if (!_lastKeyHit)
return;
-
+ if (_lastKeyHit == '4') {
+ runScript(4, 0,0,0);
+ return;
+ }
if (_keyScriptNo && (_keyScriptKey == _lastKeyHit)) {
runScript(_keyScriptNo, 0, 0, 0);
return;