[Scummvm-cvs-logs] CVS: scummvm/saga sfuncs.cpp,1.109,1.110

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18726

Modified Files:
	sfuncs.cpp 
Log Message:
Cleanup


Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- sfuncs.cpp	8 May 2005 21:49:43 -0000	1.109
+++ sfuncs.cpp	11 May 2005 06:57:58 -0000	1.110
@@ -770,31 +770,24 @@
 	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)