[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.19,2.20 vars.cpp,1.23,1.24

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27254

Modified Files:
	scummvm.cpp vars.cpp 
Log Message:
override var was wrong, update mouse click code


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- scummvm.cpp	28 Dec 2002 12:42:55 -0000	2.19
+++ scummvm.cpp	29 Dec 2002 15:06:44 -0000	2.20
@@ -1213,7 +1213,15 @@
 		_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;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- vars.cpp	29 Dec 2002 14:56:25 -0000	1.23
+++ vars.cpp	29 Dec 2002 15:06:44 -0000	1.24
@@ -225,10 +225,7 @@
 
 	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 @@
 	// 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