diff options
| -rw-r--r-- | scumm/scummvm.cpp | 11 | ||||
| -rw-r--r-- | scumm/vars.cpp | 2 |
2 files changed, 9 insertions, 4 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; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index df57d0a2af..0b49d78c9d 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -226,7 +226,7 @@ void Scumm_v8::setupScummVars() VAR_TALK_ACTOR = 14; VAR_HAVE_MSG = 15; VAR_MOUSE_BUTTONS = 16; - // TODO: what is var17 (used in room 10 script 2004) ? + VAR_RIGHTBTN_HOLD = 17; // TODO: Guess (used in room 10 script 2004, and ship-to-ship combat) VAR_MOUSE_HOLD = 18; VAR_TIMEDATE_YEAR = 24; |