diff options
| -rw-r--r-- | scumm/scummvm.cpp | 10 | ||||
| -rw-r--r-- | scumm/vars.cpp | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 42239973f4..5f9acef0b8 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1213,7 +1213,15 @@ int Scumm::getKeyInput(int a) _mouseButStat = MBS_RIGHT_CLICK; } - if (_features & GF_AFTER_V7) { + if (_features & GF_AFTER_V8) { + _vars[VAR_MOUSE_BUTTONS] = 0; + if (_leftBtnPressed & msClicked) + _vars[VAR_MOUSE_BUTTONS] =+ 1; + + if (_rightBtnPressed & msClicked) + _vars[VAR_MOUSE_BUTTONS] =+ 2; + + } else if (_features & GF_AFTER_V7) { // _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0; _vars[VAR_LEFTBTN_HOLD] = (_leftBtnPressed & msDown) != 0; // _vars[VAR_RIGHTBTN_DOWN] = (_rightBtnPressed&msClicked) != 0; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index 51549011a6..c00be1831c 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -225,10 +225,7 @@ void Scumm_v8::setupScummVars() VAR_TALK_ACTOR = 14; VAR_HAVE_MSG = 15; - VAR_LEFTBTN_HOLD = 16; // FIXME: This is actually some kind of bitfield - VAR_RIGHTBTN_HOLD = 17; - VAR_LEFTBTN_DOWN = 18; - VAR_RIGHTBTN_DOWN = 19; + VAR_MOUSE_BUTTONS = 16; // VAR_TIMEDATE_YEAR = 24; // VAR_TIMEDATE_MONTH = 25; @@ -237,7 +234,7 @@ void Scumm_v8::setupScummVars() // VAR_TIMEDATE_MINUTE = 28; // VAR_TIMEDATE_SECOND = 29; - VAR_OVERRIDE = 30; + //VAR_OVERRIDE = 30; // Oops. 30 has something to do with overrides, but this isn't it.. VAR_ROOM = 31; //VAR_VOICE_MODE = 39; // 0 is voice, 1 is voice+text, 2 is text only |