[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.96,2.97

Jamieson Christian jamieson630 at users.sourceforge.net
Wed May 21 10:35:01 CEST 2003


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

Modified Files:
	script_v2.cpp 
Log Message:
Fixed VC++ warning

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.96
retrieving revision 2.97
diff -u -d -r2.96 -r2.97
--- script_v2.cpp	21 May 2003 14:25:50 -0000	2.96
+++ script_v2.cpp	21 May 2003 17:34:01 -0000	2.97
@@ -1161,7 +1161,7 @@
 	warning("TODO o2_cutscene()");
 
 	vm.cutSceneData[0] = _userState;
-	vm.cutSceneData[1] = VAR(VAR_CURSORSTATE);
+	vm.cutSceneData[1] = (int16) VAR(VAR_CURSORSTATE);
 	vm.cutSceneData[2] = _currentRoom;
 	vm.cutSceneData[3] = camera._mode;
 	
@@ -1190,7 +1190,7 @@
 	// TODO: some cursor command stuff (probably to reset it to the pre-cutscene state)
 	
 	if (_gameId == GID_MANIAC) {
-		camera._mode = vm.cutSceneData[3];
+		camera._mode = (byte) vm.cutSceneData[3];
 		if (camera._mode == CM_FOLLOW_ACTOR) {
 			actorFollowCamera(VAR(VAR_EGO));
 		} else if (vm.cutSceneData[2] != _currentRoom) {





More information about the Scummvm-git-logs mailing list