aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2009-07-29 08:55:04 +0000
committerMax Horn2009-07-29 08:55:04 +0000
commitf6e16537b392bca876e0b72ffb3ec548f7d25673 (patch)
tree31861fa8de6ac375712aa5cdad7e9e248bfe3057 /engines/scumm
parenteb9600b5e95f105736f01b9adbbd603e69b51638 (diff)
downloadscummvm-rg350-f6e16537b392bca876e0b72ffb3ec548f7d25673.tar.gz
scummvm-rg350-f6e16537b392bca876e0b72ffb3ec548f7d25673.tar.bz2
scummvm-rg350-f6e16537b392bca876e0b72ffb3ec548f7d25673.zip
SCUMM: cleanup
svn-id: r42880
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/verbs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 16c128ed68..1ab9d72a58 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -377,7 +377,7 @@ void ScummEngine_v2::checkV2Inventory(int x, int y) {
if (object > 0) {
if (_game.version == 0) {
- _activeInventory = object;
+ _activeInventory = object;
} else {
runInputScript(kInventoryClickArea, object, 0);
@@ -626,14 +626,14 @@ void ScummEngine_v2::checkExecVerbs() {
if (vs->verbid && vs->saveid == 0 && vs->curmode == 1) {
if (_mouseAndKeyboardStat == vs->key) {
// Trigger verb as if the user clicked it
- runInputScript(1, vs->verbid, 1);
+ runInputScript(kVerbClickArea, vs->verbid, 1);
return;
}
}
}
// Generic keyboard input
- runInputScript(4, _mouseAndKeyboardStat, 1);
+ runInputScript(kKeyClickArea, _mouseAndKeyboardStat, 1);
} else if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
VirtScreen *zone = findVirtScreen(_mouse.y);
const byte code = _mouseAndKeyboardStat & MBS_LEFT_CLICK ? 1 : 2;
@@ -646,7 +646,7 @@ void ScummEngine_v2::checkExecVerbs() {
if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
// Click into V2 sentence line
- runInputScript(5, 0, 0);
+ runInputScript(kSentenceClickArea, 0, 0);
} else if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + inventoryArea) {
// Click into V2 inventory
checkV2Inventory(_mouse.x, _mouse.y);
@@ -654,7 +654,7 @@ void ScummEngine_v2::checkExecVerbs() {
over = findVerbAtPos(_mouse.x, _mouse.y);
if (over != 0) {
// Verb was clicked
- runInputScript(1, _verbs[over].verbid, code);
+ runInputScript(kVerbClickArea, _verbs[over].verbid, code);
} else {
// Scene was clicked
runInputScript((zone->number == kMainVirtScreen) ? kSceneClickArea : kVerbClickArea, 0, code);