diff options
author | whiterandrek | 2018-06-15 14:07:48 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 9b8d72bfb53ce7b9eacc435f540b2b956f6fb759 (patch) | |
tree | daf59e96a297e9d8972c6f7935ca129f122b3ce2 /engines | |
parent | 861ef3be97eb7efca8d812aab953c8e0aaf32e08 (diff) | |
download | scummvm-rg350-9b8d72bfb53ce7b9eacc435f540b2b956f6fb759.tar.gz scummvm-rg350-9b8d72bfb53ce7b9eacc435f540b2b956f6fb759.tar.bz2 scummvm-rg350-9b8d72bfb53ce7b9eacc435f540b2b956f6fb759.zip |
PINK: fix naming
Diffstat (limited to 'engines')
-rw-r--r-- | engines/pink/objects/actors/actor.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/actors/actor.h | 2 | ||||
-rw-r--r-- | engines/pink/objects/actors/lead_actor.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/pages/game_page.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.cpp | 6 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp index 42c9e2d992..7abab3cb9a 100644 --- a/engines/pink/objects/actors/actor.cpp +++ b/engines/pink/objects/actors/actor.cpp @@ -71,7 +71,7 @@ void Actor::init(bool paused) { } } -bool Actor::initPallete(Director *director) { +bool Actor::initPalette(Director *director) { for (uint i = 0; i < _actions.size(); ++i) { if (_actions[i]->initPalette(director)) return true; diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h index 7927c1bfb5..cd84fd2d2d 100644 --- a/engines/pink/objects/actors/actor.h +++ b/engines/pink/objects/actors/actor.h @@ -48,7 +48,7 @@ public: void saveState(Archive &archive); virtual void init(bool paused); - bool initPallete(Director *director); + bool initPalette(Director *director); void toConsole() override ; diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index 62dc177254..9f04e7417c 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -301,7 +301,7 @@ void LeadActor::onWalkEnd(const Common::String &stopName) { } void LeadActor::onPDAClose() { - _page->initPallete(); + _page->initPalette(); _page->getGame()->getDirector()->loadStage(); _state = _stateBeforePDA; diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp index 9f1aaed8fa..d383a9b066 100644 --- a/engines/pink/objects/pages/game_page.cpp +++ b/engines/pink/objects/pages/game_page.cpp @@ -74,7 +74,7 @@ void GamePage::init(bool isLoadingSave) { toConsole(); - initPallete(); + initPalette(); LeadActor::State state = _leadActor->getState(); bool paused = (state == LeadActor::kInventory || state == LeadActor::kPDA); diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp index c15d3dbae9..086253de13 100644 --- a/engines/pink/objects/pages/page.cpp +++ b/engines/pink/objects/pages/page.cpp @@ -54,15 +54,15 @@ void Page::toConsole() { } void Page::init() { - initPallete(); + initPalette(); for (uint i = 0; i < _actors.size(); ++i) { _actors[i]->init(0); } } -void Page::initPallete() { +void Page::initPalette() { for (uint i = 0; i < _actors.size(); ++i) { - if (_actors[i]->initPallete(getGame()->getDirector())) + if (_actors[i]->initPalette(getGame()->getDirector())) break; } } diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index b8d0a819e0..4fb8772402 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -41,7 +41,7 @@ public: void load(Archive &archive); void init(); - void initPallete(); + void initPalette(); Actor *findActor(const Common::String &name); LeadActor *getLeadActor() { return _leadActor; } |