diff options
author | Filippos Karapetis | 2011-01-31 16:11:49 +0000 |
---|---|---|
committer | Filippos Karapetis | 2011-01-31 16:11:49 +0000 |
commit | 4a07ae68291bf0fde9b207af9b8b5277fb5049e5 (patch) | |
tree | 738776a6e5f9628845d7d25f998d3d6794b7c39e | |
parent | d45a2a97a3fee377f72e81da65f42925038450a5 (diff) | |
download | scummvm-rg350-4a07ae68291bf0fde9b207af9b8b5277fb5049e5.tar.gz scummvm-rg350-4a07ae68291bf0fde9b207af9b8b5277fb5049e5.tar.bz2 scummvm-rg350-4a07ae68291bf0fde9b207af9b8b5277fb5049e5.zip |
SAGA: Simplified loadActorResources() and removed the unused _disabled field
svn-id: r55687
-rw-r--r-- | engines/saga/actor.cpp | 36 | ||||
-rw-r--r-- | engines/saga/actor.h | 4 | ||||
-rw-r--r-- | engines/saga/actor_walk.cpp | 3 |
3 files changed, 3 insertions, 40 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 5111f1ae07..8e2ce4fcc6 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -277,10 +277,7 @@ Actor::Actor(SagaEngine *vm) : _vm(vm) { actor->_location.y = ITE_ActorTable[i].y; actor->_location.z = ITE_ActorTable[i].z; - actor->_disabled = !loadActorResources(actor); - if (actor->_disabled) { - warning("Disabling actor Id=%d index=%d", actor->_id, actor->_index); - } + loadActorResources(actor); } _objs.resize(ITE_OBJECTCOUNT); i = 0; @@ -335,29 +332,11 @@ void Actor::loadFrameList(int frameListResourceId, ActorFrameSequences &frames) } } -bool Actor::loadActorResources(ActorData *actor) { - bool gotSomething = false; - +void Actor::loadActorResources(ActorData *actor) { if (actor->_frameListResourceId) { loadFrameList(actor->_frameListResourceId, actor->_framesContainer); actor->_frames = &actor->_framesContainer; - - gotSomething = true; - } else { - // It's normal for some actors to have no frames - //warning("Frame List ID = 0 for actor index %d", actor->_index); - - //if (_vm->getGameId() == GID_ITE) - return true; - } - - if (actor->_spriteListResourceId) { - gotSomething = true; - } else { - warning("Sprite List ID = 0 for actor index %d", actor->_index); } - - return gotSomething; } void Actor::loadActorSpriteList(ActorData *actor) { @@ -612,9 +591,6 @@ ObjectData *Actor::getObj(uint16 objId) { obj = &_objs[objIdToIndex(objId)]; - if (obj->_disabled) - error("Actor::getObj disabled objId 0x%X", objId); - return obj; } @@ -635,9 +611,6 @@ ActorData *Actor::getActor(uint16 actorId) { actor = &_actors[actorIdToIndex(actorId)]; - if (actor->_disabled) - error("Actor::getActor disabled actorId 0x%X", actorId); - return actor; } @@ -704,8 +677,6 @@ ActorFrameRange *Actor::getActorFrameRange(uint16 actorId, int frameType) { static ActorFrameRange def = {0, 0}; actor = getActor(actorId); - if (actor->_disabled) - error("Actor::getActorFrameRange Wrong actorId 0x%X", actorId); if ((actor->_facingDirection < kDirUp) || (actor->_facingDirection > kDirUpLeft)) error("Actor::getActorFrameRange Wrong direction 0x%X actorId 0x%X", actor->_facingDirection, actorId); @@ -1026,9 +997,6 @@ void Actor::createDrawOrderList() { } for (ObjectDataArray::iterator obj = _objs.begin(); obj != _objs.end(); ++obj) { - if (obj->_disabled) - continue; - if (obj->_sceneNumber != _vm->_scene->currentSceneNumber()) continue; diff --git a/engines/saga/actor.h b/engines/saga/actor.h index 6f74eea771..01feacb75b 100644 --- a/engines/saga/actor.h +++ b/engines/saga/actor.h @@ -287,7 +287,6 @@ struct Location { class CommonObjectData { public: //constant - bool _disabled; // disabled in init section int32 _index; // index in local array uint16 _id; // object id int32 _scriptEntrypointNumber; // script entrypoint number @@ -327,7 +326,6 @@ public: } CommonObjectData() { - _disabled = false; _index = 0; _id = 0; _scriptEntrypointNumber = 0; @@ -550,7 +548,7 @@ public: protected: friend class Script; - bool loadActorResources(ActorData *actor); + void loadActorResources(ActorData *actor); void loadFrameList(int frameListResourceId, ActorFrameSequences &frames); private: void stepZoneAction(ActorData *actor, const HitZone *hitZone, bool exit, bool stopped); diff --git a/engines/saga/actor_walk.cpp b/engines/saga/actor_walk.cpp index 5a8ea0c856..310bc3b26c 100644 --- a/engines/saga/actor_walk.cpp +++ b/engines/saga/actor_walk.cpp @@ -198,9 +198,6 @@ void Actor::updateActorsScene(int actorsEntrance) { for (ActorDataArray::iterator actor = _actors.begin(); actor != _actors.end(); ++actor) { actor->_inScene = false; actor->_spriteList.clear(); - if (actor->_disabled) { - continue; - } if ((actor->_flags & (kProtagonist | kFollower)) || (actor->_index == 0)) { if (actor->_flags & kProtagonist) { actor->_finalTarget = actor->_location; |