[Scummvm-cvs-logs] CVS: scummvm/sword2 function.cpp,1.70,1.70.2.1

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Jan 19 23:46:11 CET 2005


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

Modified Files:
      Tag: branch-0-7-0
	function.cpp 
Log Message:
Backported fix for fnInteract regression. (It's currently not known what
effect this has, but now it matches the original code again.)


Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -u -d -r1.70 -r1.70.2.1
--- function.cpp	16 Nov 2004 09:15:25 -0000	1.70
+++ function.cpp	20 Jan 2005 07:45:34 -0000	1.70.2.1
@@ -71,7 +71,7 @@
 	//		  reference
 
 	_scriptVars[PLAYER_ACTION] = 0;		// must clear this
-	logicUp((params[0] < 16) + 2);		// 3rd script of clicked on id
+	logicUp((params[0] << 16) | 2);		// 3rd script of clicked on id
 
 	// Out, up and around again - pc is saved for current level to be
 	// returned to.





More information about the Scummvm-git-logs mailing list