[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.205,1.206 vars.cpp,1.102,1.103

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2943/scumm

Modified Files:
	scumm.cpp vars.cpp 
Log Message:

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


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- scumm.cpp	16 Sep 2004 09:47:07 -0000	1.205
+++ scumm.cpp	17 Sep 2004 02:59:37 -0000	1.206
@@ -2118,13 +2118,13 @@
 			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;
 		}
 	}
 

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- vars.cpp	14 Sep 2004 15:06:02 -0000	1.102
+++ vars.cpp	17 Sep 2004 02:59:38 -0000	1.103
@@ -155,12 +155,12 @@
 	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 @@
 	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;