[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.126,1.127

[Torbjörn Andersson]

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

Modified Files:
	actor.cpp 
Log Message:
Fixed one part of the problem with Rif's encounter with Sist. Rif no longer
disappears, but he still won't respond to commands. And he appears to be
facing in the wrong direction.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- actor.cpp	10 May 2005 22:55:49 -0000	1.126
+++ actor.cpp	11 May 2005 06:57:44 -0000	1.127
@@ -1214,21 +1214,23 @@
 	_drawOrderList.clear();
 	for (i = 0; i < _actorsCount; i++) {
 		actor = _actors[i];
-		if (actor->disabled) continue;
-		if (actor->sceneNumber != _vm->_scene->currentSceneNumber()) continue;
-
-		_drawOrderList.pushBack(actor, compareFunction);
+		if (actor->disabled)
+			continue;
 
-		calcScreenPosition(actor);
+		if (i == 0 || actor->flags & (kFollower | kProtagonist) || actor->sceneNumber == _vm->_scene->currentSceneNumber()) {
+			_drawOrderList.pushBack(actor, compareFunction);
+			calcScreenPosition(actor);
+		}
 	}
 
 	for (i = 0; i < _objsCount; i++) {
 		obj = _objs[i];
-		if (obj->disabled) continue;
-		if (obj->sceneNumber != _vm->_scene->currentSceneNumber()) continue;
+		if (obj->disabled)
+			continue;
+		if (obj->sceneNumber != _vm->_scene->currentSceneNumber())
+			 continue;
 
 		_drawOrderList.pushBack(obj, compareFunction);
-
 		calcScreenPosition(obj);
 	}
 }