diff options
| author | Torbjörn Andersson | 2005-05-11 06:57:58 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-05-11 06:57:58 +0000 |
| commit | e0e27b0a094a6866f09c61a207bdb0e8b3c67c2c (patch) | |
| tree | 6181023a60569527b4ac700f87a8e2dab05e8091 /saga | |
| parent | 9b4e45235187bff44384b046aa0982177b4b58bd (diff) | |
| download | scummvm-rg350-e0e27b0a094a6866f09c61a207bdb0e8b3c67c2c.tar.gz scummvm-rg350-e0e27b0a094a6866f09c61a207bdb0e8b3c67c2c.tar.bz2 scummvm-rg350-e0e27b0a094a6866f09c61a207bdb0e8b3c67c2c.zip | |
Cleanup
svn-id: r18045
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/sfuncs.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 8c190a6a0b..96f8b5c2af 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -770,31 +770,24 @@ void Script::sfSwapActors(SCRIPTFUNC_PARAMS) { int16 actorId2; ActorData *actor1; ActorData *actor2; - Location location; actorId1 = thread->pop(); actorId2 = thread->pop(); actor1 = _vm->_actor->getActor(actorId1); actor2 = _vm->_actor->getActor(actorId2); - location = actor1->location; - actor1->location = actor2->location; - actor2->location = location; - + + SWAP(actor1->location, actor2->location); if (actor1->flags & kProtagonist) { actor1->flags &= ~kProtagonist; actor2->flags |= kProtagonist; _vm->_actor->_protagonist = _vm->_actor->_centerActor = actor2; - } else { - if (actor2->flags & kProtagonist) { + } else if (actor2->flags & kProtagonist) { actor2->flags &= ~kProtagonist; actor1->flags |= kProtagonist; _vm->_actor->_protagonist = _vm->_actor->_centerActor = actor1; - } } - - } // Script function #35 (0x23) |