[Scummvm-cvs-logs] SF.net SVN: scummvm: [28902] scummvm/trunk/engines/saga/sfuncs.cpp

[thebluegr at users.sourceforge.net]

Revision: 28902
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28902&view=rev
Author:   thebluegr
Date:     2007-09-14 05:49:09 -0700 (Fri, 14 Sep 2007)

Log Message:
-----------
Some more opcode simplifications

Modified Paths:
--------------
    scummvm/trunk/engines/saga/sfuncs.cpp

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-09-14 12:42:47 UTC (rev 28901)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-09-14 12:49:09 UTC (rev 28902)
@@ -1299,10 +1299,9 @@
 // Param6: flags
 void Script::sfThrowActor(SCRIPTFUNC_PARAMS) {
 	ActorData *actor = _vm->_actor->getActor(thread->pop());
-	Location location;
-	location.x = thread->pop();
-	location.y = thread->pop();
-	location.z = actor->_location.z;
+	actor->_finalTarget.x = thread->pop();
+	actor->_finalTarget.y = thread->pop();
+	actor->_finalTarget.z = actor->_location.z;
 	thread->pop();	// not used
 	int32 actionCycle = thread->pop();
 	int16 flags = thread->pop();
@@ -1313,7 +1312,6 @@
 	actor->_fallVelocity = - (actor->_fallAcceleration * actor->_actionCycle) / 2;
 	actor->_fallPosition = actor->_location.z << 4;
 
-	actor->_finalTarget = location;
 	actor->_actionCycle--;
 	if (!(flags & kWalkAsync)) {
 		thread->waitWalk(actor);
@@ -1343,9 +1341,7 @@
 // Param2: scene number
 void Script::sfChangeActorScene(SCRIPTFUNC_PARAMS) {
 	ActorData *actor = _vm->_actor->getActor(thread->pop());
-	int32 sceneNumber = thread->pop();
-
-	actor->_sceneNumber = sceneNumber;
+	actor->_sceneNumber = thread->pop();
 }
 
 // Script function #56 (0x38)


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