aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorJames Brown2003-01-17 07:20:54 +0000
committerJames Brown2003-01-17 07:20:54 +0000
commit945dee311e9d1cf798a7ad3fa996d6913f1d257d (patch)
tree1f5d3b3205ee83f40ce1bfd872b5b5037336551b /scumm/scummvm.cpp
parentd589ecb14b0c5df04d0cfed549d9c5bead1da186 (diff)
downloadscummvm-rg350-945dee311e9d1cf798a7ad3fa996d6913f1d257d.tar.gz
scummvm-rg350-945dee311e9d1cf798a7ad3fa996d6913f1d257d.tar.bz2
scummvm-rg350-945dee311e9d1cf798a7ad3fa996d6913f1d257d.zip
Possible hack to get the cannons firing. Of course... well, they still don't quite work :)
svn-id: r6487
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 1c4019fa06..d3cf752a7f 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1251,17 +1251,22 @@ int Scumm::getKeyInput(int a)
if (_features & GF_AFTER_V8) {
_vars[VAR_MOUSE_BUTTONS] = 0;
+ _vars[VAR_MOUSE_HOLD] = 0;
+ _vars[VAR_RIGHTBTN_HOLD] = 0;
+
if (_leftBtnPressed & msClicked)
_vars[VAR_MOUSE_BUTTONS] += 1;
+
if (_rightBtnPressed & msClicked)
_vars[VAR_MOUSE_BUTTONS] += 2;
- _vars[VAR_MOUSE_HOLD] = 0;
if (_leftBtnPressed & msDown)
_vars[VAR_MOUSE_HOLD] += 1;
- if (_rightBtnPressed & msDown)
- _vars[VAR_MOUSE_HOLD] += 2;
+ if (_rightBtnPressed & msDown) {
+ _vars[VAR_RIGHTBTN_HOLD] = 1;
+ _vars[VAR_MOUSE_HOLD] += 2;
+ }
} else if (_features & GF_AFTER_V7) {
// _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0;
_vars[VAR_LEFTBTN_HOLD] = (_leftBtnPressed & msDown) != 0;