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

[cyx at users.sourceforge.net]

Revision: 24911
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24911&view=rev
Author:   cyx
Date:     2006-12-21 07:18:26 -0800 (Thu, 21 Dec 2006)

Log Message:
-----------
passing the room as an argument to putActor is optionnal here

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/debugger.cpp
    scummvm/trunk/engines/scumm/script_c64.cpp

Modified: scummvm/trunk/engines/scumm/debugger.cpp
===================================================================
--- scummvm/trunk/engines/scumm/debugger.cpp	2006-12-21 15:09:13 UTC (rev 24910)
+++ scummvm/trunk/engines/scumm/debugger.cpp	2006-12-21 15:18:26 UTC (rev 24911)
@@ -383,11 +383,11 @@
 		a->_ignoreBoxes = (value > 0);
 		DebugPrintf("Actor[%d].ignoreBoxes = %d\n", actnum, a->_ignoreBoxes);
 	} else if (!strcmp(argv[2], "x")) {
-		a->putActor(value, a->getPos().y, a->_room);
+		a->putActor(value, a->getPos().y);
 		DebugPrintf("Actor[%d].x = %d\n", actnum, a->getPos().x);
 		_vm->_fullRedraw = true;
 	} else if (!strcmp(argv[2], "y")) {
-		a->putActor(a->getPos().x, value, a->_room);
+		a->putActor(a->getPos().x, value);
 		DebugPrintf("Actor[%d].y = %d\n", actnum, a->getPos().y);
 		_vm->_fullRedraw = true;
 	} else if (!strcmp(argv[2], "_elevation")) {

Modified: scummvm/trunk/engines/scumm/script_c64.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_c64.cpp	2006-12-21 15:09:13 UTC (rev 24910)
+++ scummvm/trunk/engines/scumm/script_c64.cpp	2006-12-21 15:18:26 UTC (rev 24911)
@@ -749,7 +749,7 @@
 		y = 60;
 	}
 
-	a->putActor(x, y, a->_room);
+	a->putActor(x, y);
 }
 
 void ScummEngine_c64::o_pickupObject() {


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