diff options
| author | Andrew Kurushin | 2005-04-20 19:38:04 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-04-20 19:38:04 +0000 |
| commit | 89c0e7a69cbfe630cce2bfe9078a49abdff8e4ef (patch) | |
| tree | f0ed89177b54e0d0a8137e2c58725e2e08807891 | |
| parent | c46ea8bc407e60224500e6d6efa08d2ddd6f318e (diff) | |
| download | scummvm-rg350-89c0e7a69cbfe630cce2bfe9078a49abdff8e4ef.tar.gz scummvm-rg350-89c0e7a69cbfe630cce2bfe9078a49abdff8e4ef.tar.bz2 scummvm-rg350-89c0e7a69cbfe630cce2bfe9078a49abdff8e4ef.zip | |
fixed actors bug after all demo passed
svn-id: r17717
| -rw-r--r-- | saga/actor.cpp | 2 | ||||
| -rw-r--r-- | saga/scene.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index 55e1f1e241..0926fdb2f4 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -597,6 +597,8 @@ void Actor::updateActorsScene(int actorsEntrance) { _protagonist->location.z = sceneEntry->location.z * ACTOR_LMULT; } _protagonist->facingDirection = _protagonist->actionDirection = sceneEntry->facing; + } else { + warning("actorsEntrance < 0"); } _protagonist->currentAction = kActionWait; diff --git a/saga/scene.cpp b/saga/scene.cpp index 46e2d6ee7e..c03263fb37 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -190,7 +190,7 @@ int Scene::startScene() { scene_qdat = queueIterator.operator->(); assert(scene_qdat != NULL); - loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, -1); + loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, 0); return SUCCESS; } @@ -229,7 +229,7 @@ int Scene::nextScene() { scene_qdat = queueIterator.operator->(); assert(scene_qdat != NULL); - loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, -1); + loadScene(scene_qdat->scene_n, scene_qdat->load_flag, scene_qdat->scene_proc, scene_qdat->sceneDescription, scene_qdat->fadeType, 0); return SUCCESS; } |