diff options
author | Andrew Kurushin | 2010-10-22 23:13:17 +0000 |
---|---|---|
committer | Andrew Kurushin | 2010-10-22 23:13:17 +0000 |
commit | f24394b85f5d34815659c50cd956c262f4b79d68 (patch) | |
tree | 8c93e3f052133b154b1686e00b4066b3967f0c02 /engines/saga/actor_walk.cpp | |
parent | b8ff3eb4913dd22bc75ae360baadadd95151077f (diff) | |
download | scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.tar.gz scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.tar.bz2 scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.zip |
SAGA: replace Actor::_pathCell, Anim::*, Converse::text, IsoMap::*, Music::_songTable, ObjectMap::*, PalAnim::*, Scene::sceneLut, SndRes::_fxTable* malloc based arrays with Common::Array implementation
add ByteArray type
fix debug Tile Hittest frame drawing
debug 0x%x => 0x%X
svn-id: r53719
Diffstat (limited to 'engines/saga/actor_walk.cpp')
-rw-r--r-- | engines/saga/actor_walk.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/actor_walk.cpp b/engines/saga/actor_walk.cpp index 589bc89c85..620b8ee2b6 100644 --- a/engines/saga/actor_walk.cpp +++ b/engines/saga/actor_walk.cpp @@ -227,12 +227,12 @@ void Actor::updateActorsScene(int actorsEntrance) { if (_protagonist == NULL) return; - if ((actorsEntrance >= 0) && (_vm->_scene->_entryList.entryListCount > 0)) { - if (_vm->_scene->_entryList.entryListCount <= actorsEntrance) { + if ((actorsEntrance >= 0) && (!_vm->_scene->_entryList.empty())) { + if (_vm->_scene->_entryList.size() <= uint(actorsEntrance)) { actorsEntrance = 0; //OCEAN bug } - sceneEntry = _vm->_scene->_entryList.getEntry(actorsEntrance); + sceneEntry = &_vm->_scene->_entryList[actorsEntrance]; if (_vm->_scene->getFlags() & kSceneFlagISO) { _protagonist->_location = sceneEntry->location; } else { @@ -722,7 +722,7 @@ void Actor::handleActions(int msec, bool setup) { void Actor::direct(int msec) { - if (_vm->_scene->_entryList.entryListCount == 0) { + if (_vm->_scene->_entryList.empty()) { return; } |