aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTobias Gunkel2012-01-28 21:32:41 +0100
committerTobias Gunkel2012-02-11 08:29:44 +0100
commit7d409dd15f13f517c083e58d0e5c59ec0776c974 (patch)
treedfaff6237547eadaceb6f49587ed4cee13d3cf69 /engines/scumm
parent08e1e127e9a03b10b83b790458bdfff5130aa510 (diff)
downloadscummvm-rg350-7d409dd15f13f517c083e58d0e5c59ec0776c974.tar.gz
scummvm-rg350-7d409dd15f13f517c083e58d0e5c59ec0776c974.tar.bz2
scummvm-rg350-7d409dd15f13f517c083e58d0e5c59ec0776c974.zip
SCUMM: in v0 do not allow an inventory item as 2nd object of a give-to command
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/verbs.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 7a099adae9..4347ad9db9 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -809,6 +809,9 @@ void ScummEngine_v0::checkExecVerbs() {
// inventory position changed (arrows pressed, do nothing)
return;
}
+ // the second object of a give-to command has to be an actor
+ if (_activeVerb == kVerbGive && _activeObject)
+ obj = 0;
// click region: main screen
} else if (zone->number == kMainVirtScreen) {
// click into main screen