[Scummvm-cvs-logs] CVS: scummvm/scumm vars.cpp,1.33,1.34 scummvm.cpp,2.43,2.44

James Brown ender at users.sourceforge.net
Thu Jan 16 23:28:02 CET 2003


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

Modified Files:
	vars.cpp scummvm.cpp 
Log Message:
Possible hack to get the cannons firing. Of course... well, they still don't quite work :)


Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- vars.cpp	5 Jan 2003 22:16:19 -0000	1.33
+++ vars.cpp	17 Jan 2003 07:20:54 -0000	1.34
@@ -226,7 +226,7 @@
 	VAR_TALK_ACTOR = 14;
 	VAR_HAVE_MSG = 15;
 	VAR_MOUSE_BUTTONS = 16;
-	// TODO: what is var17 (used in room 10 script 2004) ?
+	VAR_RIGHTBTN_HOLD = 17; // TODO: Guess (used in room 10 script 2004, and ship-to-ship combat)
 	VAR_MOUSE_HOLD = 18;
 
 	VAR_TIMEDATE_YEAR = 24;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.43
retrieving revision 2.44
diff -u -d -r2.43 -r2.44
--- scummvm.cpp	16 Jan 2003 17:37:34 -0000	2.43
+++ scummvm.cpp	17 Jan 2003 07:20:54 -0000	2.44
@@ -1251,17 +1251,22 @@
 
 	if (_features & GF_AFTER_V8) {
 		_vars[VAR_MOUSE_BUTTONS] = 0;
+		_vars[VAR_MOUSE_HOLD] = 0;
+		_vars[VAR_RIGHTBTN_HOLD] = 0;
+
 		if (_leftBtnPressed & msClicked)
 			_vars[VAR_MOUSE_BUTTONS] += 1;
+
 		if (_rightBtnPressed & msClicked)
 			_vars[VAR_MOUSE_BUTTONS] += 2;
 
-		_vars[VAR_MOUSE_HOLD] = 0;
 		if (_leftBtnPressed & msDown)
 			_vars[VAR_MOUSE_HOLD] += 1;
-		if (_rightBtnPressed & msDown)
-			_vars[VAR_MOUSE_HOLD] += 2;
 
+		if (_rightBtnPressed & msDown) {
+			_vars[VAR_RIGHTBTN_HOLD] = 1;
+			_vars[VAR_MOUSE_HOLD] += 2;
+		}
 	} else if (_features & GF_AFTER_V7) {
 //    _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0;
 		_vars[VAR_LEFTBTN_HOLD] = (_leftBtnPressed & msDown) != 0;





More information about the Scummvm-git-logs mailing list