libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct mouse vars, should be mouse hold in scumm6/HE.

Browse Source 
baloon works now.

svn-id: r15143
This commit is contained in:
Travis Howell 2004-09-17 02:59:38 +00:00
parent 2ac60430fc
commit 3f7ecb9db2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scumm/scumm.cpp
View File

@ -2118,13 +2118,13 @@ void ScummEngine::processKbd(bool smushMode) {
VAR(VAR_RIGHTBTN_HOLD) = 1;
VAR(VAR_MOUSE_HOLD) += 2;
}
} else if (_version >= 6 && !(_features & GF_HUMONGOUS)) {
VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed & msClicked) != 0;
VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed & msClicked) != 0;
} else if (_version >= 6) {
VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
if (_version == 7) {
VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed & msClicked) != 0;
VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed & msClicked) != 0;
}
}

8
scumm/vars.cpp
View File

@ -155,12 +155,12 @@ void ScummEngine_v6::setupScummVars() {
VAR_V6_SCREEN_WIDTH = 41;
VAR_V6_SCREEN_HEIGHT = 54;
VAR_LEFTBTN_HOLD = 74;
VAR_RIGHTBTN_HOLD = 75;
if (!(_features & GF_HUMONGOUS)) {
VAR_SAVELOAD_SCRIPT = 61;
VAR_SAVELOAD_SCRIPT2 = 62;
VAR_LEFTBTN_DOWN = 74;
VAR_RIGHTBTN_DOWN = 75;
}
VAR_V6_EMSSPACE = 76;
@ -202,6 +202,8 @@ void ScummEngine_v72he::setupScummVars() {
VAR_VIRT_MOUSE_Y = 14;
VAR_MOUSE_X = 15;
VAR_MOUSE_Y = 16;
VAR_LEFTBTN_HOLD = 17;
VAR_RIGHTBTN_HOLD = 18;
VAR_CURSORSTATE = 19;
VAR_USERPUT = 20;