[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.75,1.76

Travis Howell kirben at users.sourceforge.net
Sat Jul 3 04:38:07 CEST 2004


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

Modified Files:
	scumm.cpp 
Log Message:

Keep mouse mutton VARS in sync.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- scumm.cpp	1 Jul 2004 11:36:06 -0000	1.75
+++ scumm.cpp	3 Jul 2004 11:37:26 -0000	1.76
@@ -1941,9 +1941,14 @@
 			VAR(VAR_RIGHTBTN_HOLD) = 1;
 			VAR(VAR_MOUSE_HOLD) += 2;
 		}
-	} else if (_version == 7) {
-		VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
-		VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
+	} else if (_version >= 6 && !(_features & GF_HUMONGOUS)) {
+		VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed & msClicked) != 0;
+		VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed & msClicked) != 0;
+
+		if (_version == 7) {
+			VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
+			VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
+		}
 	}
 
 	_leftBtnPressed &= ~msClicked;





More information about the Scummvm-git-logs mailing list