diff options
| author | Andrew Kurushin | 2005-08-16 17:59:49 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-08-16 17:59:49 +0000 |
| commit | 968e73a93abf068e177f31c3612cbfd2fe28ff76 (patch) | |
| tree | 7364c013c9265231adb838db2d53a546212e7e26 /saga | |
| parent | b36205c875e1f089b439d8dbd53a8dfb8dfb521d (diff) | |
| download | scummvm-rg350-968e73a93abf068e177f31c3612cbfd2fe28ff76.tar.gz scummvm-rg350-968e73a93abf068e177f31c3612cbfd2fe28ff76.tar.bz2 scummvm-rg350-968e73a93abf068e177f31c3612cbfd2fe28ff76.zip | |
fix 1258781 & 1253993 bugs
(difficulties of leaving scenes)
svn-id: r18698
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/actor.cpp | 2 | ||||
| -rw-r--r-- | saga/sfuncs.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index 3ac6e62360..5967dbc1ae 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -1901,11 +1901,11 @@ bool Actor::actorWalkTo(uint16 actorId, const Location &toLocation) { } } + _barrierCount = 0; if (!(actor->_actorFlags & kActorNoCollide)) { collision.x = ACTOR_COLLISION_WIDTH * actor->_screenScale / (256 * 2); collision.y = ACTOR_COLLISION_HEIGHT * actor->_screenScale / (256 * 2); - _barrierCount = 0; for (i = 0; (i < _actorsCount) && (_barrierCount < ACTOR_BARRIERS_MAX); i++) { anotherActor = _actors[i]; diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 9cba020888..a84a1b04a7 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -393,7 +393,7 @@ void Script::sfScriptDoAction(SCRIPTFUNC_PARAMS) { moduleNumber = _vm->_scene->getScriptModuleNumber(); break; default: - error("Script::sfScriptDoAction wrong object type"); + error("Script::sfScriptDoAction wrong object type 0x%X", objectId); } event.type = kEvTOneshot; |