[Scummvm-cvs-logs] SF.net SVN: scummvm: [26132] scummvm/trunk/engines/scumm/script_v0.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Wed Mar 14 13:35:58 CET 2007


Revision: 26132
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26132&view=rev
Author:   kirben
Date:     2007-03-14 05:35:57 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------
Add recent walk box changes to SCUMM0 too.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v0.cpp

Modified: scummvm/trunk/engines/scumm/script_v0.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v0.cpp	2007-03-14 12:34:40 UTC (rev 26131)
+++ scummvm/trunk/engines/scumm/script_v0.cpp	2007-03-14 12:35:57 UTC (rev 26132)
@@ -647,6 +647,9 @@
 	startScene(a->_room, a, obj);
 
 	getObjectXYPos(obj, x, y, dir);
+	AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
+	x = r.x;
+	y = r.y;
 	a->putActor(x, y, _currentRoom);
 	a->setDirection(dir + 180);
 
@@ -742,9 +745,12 @@
 	a = derefActor(getVarOrDirectByte(PARAM_1), "o_putActorAtObject");
 
 	obj = fetchScriptByte();
-	if (whereIsObject(obj) != WIO_NOT_FOUND)
+	if (whereIsObject(obj) != WIO_NOT_FOUND) {
 		getObjectXYPos(obj, x, y);
-	else {
+		AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
+		x = r.x;
+		y = r.y;
+	} else {
 		x = 30;
 		y = 60;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list