mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-26 11:46:54 +00:00
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
This commit is contained in:
parent
088346a51c
commit
9b4e452351
@ -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;
|
||||
if (actor->disabled)
|
||||
continue;
|
||||
|
||||
_drawOrderList.pushBack(actor, compareFunction);
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user