diff options
| author | Filippos Karapetis | 2007-09-14 12:49:09 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-09-14 12:49:09 +0000 |
| commit | 1fa1b64984312844a34c742ea5a1cc3304736878 (patch) | |
| tree | 2c9058a157877600074e8d653a3ef018defeaf8f /engines/saga | |
| parent | c84ff65720f62810d54253ddf232d2e5d33a843f (diff) | |
| download | scummvm-rg350-1fa1b64984312844a34c742ea5a1cc3304736878.tar.gz scummvm-rg350-1fa1b64984312844a34c742ea5a1cc3304736878.tar.bz2 scummvm-rg350-1fa1b64984312844a34c742ea5a1cc3304736878.zip | |
Some more opcode simplifications
svn-id: r28902
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/sfuncs.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index 356121001c..62ae2e45cc 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -1299,10 +1299,9 @@ void Script::sfResumeBgdAnim(SCRIPTFUNC_PARAMS) { // 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 @@ void Script::sfThrowActor(SCRIPTFUNC_PARAMS) { 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 @@ void Script::sfScriptSceneID(SCRIPTFUNC_PARAMS) { // 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) |