aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorJames Brown2003-05-17 06:14:08 +0000
committerJames Brown2003-05-17 06:14:08 +0000
commit2813d48e929890cdb38001555e07751ccc5d95a9 (patch)
tree5df47220f6b0daa8c86475bd918a4274c25e7a7a /scumm/scummvm.cpp
parent99b26a5684382cfaa135d76a0d54074a30306f0e (diff)
downloadscummvm-rg350-2813d48e929890cdb38001555e07751ccc5d95a9.tar.gz
scummvm-rg350-2813d48e929890cdb38001555e07751ccc5d95a9.tar.bz2
scummvm-rg350-2813d48e929890cdb38001555e07751ccc5d95a9.zip
Cleanup
svn-id: r7598
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 465fb1c612..01cccc0723 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1853,9 +1853,7 @@ int Scumm::getKeyInput() {
VAR(VAR_MOUSE_HOLD) += 2;
}
} else if (_features & GF_AFTER_V7) {
-// VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed&msClicked) != 0;
VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
-// VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed&msClicked) != 0;
VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
} else if (_features & GF_AFTER_V2) {
// Store the input type. So far we can't distinguise
@@ -1867,12 +1865,12 @@ int Scumm::getKeyInput() {
VirtScreen *zone = findVirtScreen(_mouse.y);
if (zone->number == 0) // Clicked in scene
- _scummVars[32] = 2;
+ _scummVars[VAR_CLICK_AREA] = 2;
else if (zone->number == 2) // Clicked in verb/sentence
- _scummVars[32] = 1;
+ _scummVars[VAR_CLICK_AREA] = 1;
} else if (_lastKeyHit) // Key Input
- _scummVars[32] = 4;
+ _scummVars[VAR_CLICK_AREA] = 4;
}
_leftBtnPressed &= ~msClicked;