[Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.45,2.46 scumm.cpp,1.635,1.636 scumm.h,1.655,1.656 vars.cpp,1.152,1.153

Gregory Montoir cyx at users.sourceforge.net
Thu Nov 10 15:10:03 CET 2005


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

Modified Files:
	input.cpp scumm.cpp scumm.h vars.cpp 
Log Message:
V8 uses 4 variables to handle mouse buttons state (like V7), cleanup processKbd() accordingly.

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.45
retrieving revision 2.46
diff -u -d -r2.45 -r2.46
--- input.cpp	26 Oct 2005 07:13:33 -0000	2.45
+++ input.cpp	10 Nov 2005 23:09:19 -0000	2.46
@@ -278,29 +278,11 @@
 		_mouseAndKeyboardStat = MBS_RIGHT_CLICK;
 	}
 
-	if (_version == 8) {
-		VAR(VAR_MOUSE_BUTTONS) = 0;
-		VAR(VAR_MOUSE_HOLD) = 0;
-		VAR(VAR_RIGHTBTN_HOLD) = 0;
-
-		if (_leftBtnPressed & msClicked)
-			VAR(VAR_MOUSE_BUTTONS) += 1;
-
-		if (_rightBtnPressed & msClicked)
-			VAR(VAR_MOUSE_BUTTONS) += 2;
-
-		if (_leftBtnPressed & msDown)
-			VAR(VAR_MOUSE_HOLD) += 1;
-
-		if (_rightBtnPressed & msDown) {
-			VAR(VAR_RIGHTBTN_HOLD) = 1;
-			VAR(VAR_MOUSE_HOLD) += 2;
-		}
-	} else if (_version >= 6) {
+	if (_version >= 6) {
 		VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
 		VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
 
-		if (_version == 7) {
+		if (_version >= 7) {
 			VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed & msClicked) != 0;
 			VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed & msClicked) != 0;
 		}

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -d -r1.635 -r1.636
--- scumm.cpp	9 Nov 2005 19:59:57 -0000	1.635
+++ scumm.cpp	10 Nov 2005 23:09:19 -0000	1.636
@@ -1265,7 +1265,6 @@
 	VAR_V6_EMSSPACE = 0xFF;
 
 	VAR_CAMERA_POS_Y = 0xFF;
-
 	VAR_CAMERA_MIN_Y = 0xFF;
 	VAR_CAMERA_MAX_Y = 0xFF;
 	VAR_CAMERA_THRESHOLD_X = 0xFF;
@@ -1274,19 +1273,15 @@
 	VAR_CAMERA_SPEED_Y = 0xFF;
 	VAR_CAMERA_ACCEL_X = 0xFF;
 	VAR_CAMERA_ACCEL_Y = 0xFF;
-
 	VAR_CAMERA_DEST_X = 0xFF;
-
 	VAR_CAMERA_DEST_Y = 0xFF;
-
 	VAR_CAMERA_FOLLOWED_ACTOR = 0xFF;
 
 	VAR_LEFTBTN_DOWN = 0xFF;
 	VAR_RIGHTBTN_DOWN = 0xFF;
 	VAR_LEFTBTN_HOLD = 0xFF;
 	VAR_RIGHTBTN_HOLD = 0xFF;
-	VAR_MOUSE_BUTTONS = 0xFF;
-	VAR_MOUSE_HOLD = 0xFF;
+
 	VAR_SAVELOAD_SCRIPT = 0xFF;
 	VAR_SAVELOAD_SCRIPT2 = 0xFF;
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -d -r1.655 -r1.656
--- scumm.h	2 Nov 2005 21:47:44 -0000	1.655
+++ scumm.h	10 Nov 2005 23:09:20 -0000	1.656
@@ -1301,12 +1301,10 @@
 	byte VAR_MUSIC_BUNDLE_LOADED;
 	byte VAR_VOICE_BUNDLE_LOADED;
 
-	byte VAR_LEFTBTN_DOWN;	// V7
-	byte VAR_RIGHTBTN_DOWN;	// V7
-	byte VAR_LEFTBTN_HOLD;	// V6/V72HE/V7
-	byte VAR_RIGHTBTN_HOLD;	// V6/V72HE/V7
-	byte VAR_MOUSE_BUTTONS;	// V8
-	byte VAR_MOUSE_HOLD;	// V8
+	byte VAR_LEFTBTN_DOWN;	// V7/V8
+	byte VAR_RIGHTBTN_DOWN;	// V7/V8
+	byte VAR_LEFTBTN_HOLD;	// V6/V72HE/V7/V8
+	byte VAR_RIGHTBTN_HOLD;	// V6/V72HE/V7/V8
 	byte VAR_SAVELOAD_SCRIPT;	// V6/V7 (not HE)
 	byte VAR_SAVELOAD_SCRIPT2;	// V6/V7 (not HE)
 

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- vars.cpp	27 Oct 2005 06:51:42 -0000	1.152
+++ vars.cpp	10 Nov 2005 23:09:20 -0000	1.153
@@ -451,9 +451,11 @@
 
 	VAR_TALK_ACTOR = 14;
 	VAR_HAVE_MSG = 15;
-	VAR_MOUSE_BUTTONS = 16;
-	VAR_RIGHTBTN_HOLD = 17; // TODO: Guess (used in room 10 script 2004, and ship-to-ship combat)
-	VAR_MOUSE_HOLD = 18;
+
+	VAR_LEFTBTN_DOWN = 16;
+	VAR_RIGHTBTN_DOWN = 17;
+	VAR_LEFTBTN_HOLD = 18;
+	VAR_RIGHTBTN_HOLD = 19;
 
 	VAR_TIMEDATE_YEAR = 24;
 	VAR_TIMEDATE_MONTH = 25;





More information about the Scummvm-git-logs mailing list