aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-05-11 06:57:44 +0000
committerTorbjörn Andersson2005-05-11 06:57:44 +0000
commit9b4e45235187bff44384b046aa0982177b4b58bd (patch)
tree57d1763c3b155ed2a1157d1a9d08237ad25c1b4f
parent088346a51c8b0eebc6d5267e4c82ff8d6a6e0d09 (diff)
downloadscummvm-rg350-9b4e45235187bff44384b046aa0982177b4b58bd.tar.gz
scummvm-rg350-9b4e45235187bff44384b046aa0982177b4b58bd.tar.bz2
scummvm-rg350-9b4e45235187bff44384b046aa0982177b4b58bd.zip
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. svn-id: r18044
-rw-r--r--saga/actor.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp
index 2272977154..ed3231fc3c 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -1214,21 +1214,23 @@ void Actor::createDrawOrderList() {
_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);
}
}