[Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.39.2.7,2.39.2.8 scumm.cpp,1.603.2.22,1.603.2.23 scumm.h,1.647.2.8,1.647.2.9 vars.cpp,1.150.2.3,1.150.2.4

kirben kirben at users.sourceforge.net
Wed Dec 21 04:32:00 CET 2005


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

Modified Files:
      Tag: branch-0-8-0
	input.cpp scumm.cpp scumm.h vars.cpp 
Log Message:

Backport mouse fixes for COMI.


Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.39.2.7
retrieving revision 2.39.2.8
diff -u -d -r2.39.2.7 -r2.39.2.8
--- input.cpp	17 Nov 2005 10:46:53 -0000	2.39.2.7
+++ input.cpp	21 Dec 2005 12:30:58 -0000	2.39.2.8
@@ -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.603.2.22
retrieving revision 1.603.2.23
diff -u -d -r1.603.2.22 -r1.603.2.23
--- scumm.cpp	21 Dec 2005 11:37:28 -0000	1.603.2.22
+++ scumm.cpp	21 Dec 2005 12:30:58 -0000	1.603.2.23
@@ -1311,8 +1311,7 @@
 	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.647.2.8
retrieving revision 1.647.2.9
diff -u -d -r1.647.2.8 -r1.647.2.9
--- scumm.h	21 Dec 2005 11:37:28 -0000	1.647.2.8
+++ scumm.h	21 Dec 2005 12:30:58 -0000	1.647.2.9
@@ -1298,12 +1298,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.150.2.3
retrieving revision 1.150.2.4
diff -u -d -r1.150.2.3 -r1.150.2.4
--- vars.cpp	17 Nov 2005 10:46:53 -0000	1.150.2.3
+++ vars.cpp	21 Dec 2005 12:30:58 -0000	1.150.2.4
@@ -448,9 +448,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