ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed actors bug after all demo passed

Browse Source 
svn-id: r17717
This commit is contained in:
Andrew Kurushin
2005-04-20 19:38:04 +00:00
parent c46ea8bc40
commit 89c0e7a69c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saga/actor.cpp
+2
View File
@@ -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;
saga/scene.cpp
+2 -2
View File
@@ -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;
}