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 /engines/saga/actor.h | |
| 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
Diffstat (limited to 'engines/saga/actor.h')
| -rw-r--r-- | engines/saga/actor.h | 4 |
1 files changed, 1 insertions, 3 deletions
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); |