diff options
author | whiterandrek | 2018-03-22 12:30:16 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | eb6ce676e4e604f510cbf3f4d651c18911f4468f (patch) | |
tree | e2e1824b4fe29ebe86389761cca1c12d9fa5d84d /engines/pink/objects/actors | |
parent | be415cd46f7f5c87e221270ec43f050565bdd3e8 (diff) | |
download | scummvm-rg350-eb6ce676e4e604f510cbf3f4d651c18911f4468f.tar.gz scummvm-rg350-eb6ce676e4e604f510cbf3f4d651c18911f4468f.tar.bz2 scummvm-rg350-eb6ce676e4e604f510cbf3f4d651c18911f4468f.zip |
PINK: game page init fixes
Diffstat (limited to 'engines/pink/objects/actors')
-rw-r--r-- | engines/pink/objects/actors/lead_actor.cpp | 12 | ||||
-rw-r--r-- | engines/pink/objects/actors/lead_actor.h | 18 |
2 files changed, 18 insertions, 12 deletions
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index 2c886126cd..8e7411e0e8 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -39,15 +39,15 @@ void LeadActor::deserialize(Archive &archive) { } void LeadActor::setNextExecutors(Common::String &nextModule, Common::String &nextPage) { - if (_state == Ready || _state == Moving || _state == inDialog1 || _state == Inventory || _state == PDA) { - _state = PlayingVideo; + if (_state == kReady || _state == kMoving || _state == kInDialog1 || _state == kInventory || _state == kPDA) { + _state = kPlayingVideo; _page->getGame()->setNextExecutors(nextModule, nextPage); } } void LeadActor::init(bool unk) { - if (_state == unk_Loading){ - _state = Ready; + if (_state == kUnk_Loading){ + _state = kReady; } _page->getModule()->getInventoryMgr()->setLeadActor(this); Actor::init(unk); @@ -60,4 +60,8 @@ void LeadActor::toConsole() { } } +LeadActor::State LeadActor::getState() const { + return _state; +} + } // End of namespace Pink diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h index 762facbf1e..30c0a50f49 100644 --- a/engines/pink/objects/actors/lead_actor.h +++ b/engines/pink/objects/actors/lead_actor.h @@ -34,14 +34,14 @@ class Sequencer; class LeadActor : public Actor { public: enum State { - Ready = 0, - Moving, - inDialog1, //??? - Inventory, - PDA, - inDialog2,//??? - PlayingVideo, // ??? - unk_Loading // ???? + kReady = 0, + kMoving, + kInDialog1, //??? + kInventory, + kPDA, + kInDialog2,//??? + kPlayingVideo, // ??? + kUnk_Loading // ???? }; virtual void deserialize(Archive &archive); @@ -51,6 +51,8 @@ public: void setNextExecutors (Common::String &nextModule, Common::String &nextPage); virtual void init(bool unk); + State getState() const; + private: State _state; CursorMgr *_cursorMgr; |