aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/pages
diff options
context:
space:
mode:
authorwhiterandrek2018-06-15 14:07:48 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commit9b8d72bfb53ce7b9eacc435f540b2b956f6fb759 (patch)
treedaf59e96a297e9d8972c6f7935ca129f122b3ce2 /engines/pink/objects/pages
parent861ef3be97eb7efca8d812aab953c8e0aaf32e08 (diff)
downloadscummvm-rg350-9b8d72bfb53ce7b9eacc435f540b2b956f6fb759.tar.gz
scummvm-rg350-9b8d72bfb53ce7b9eacc435f540b2b956f6fb759.tar.bz2
scummvm-rg350-9b8d72bfb53ce7b9eacc435f540b2b956f6fb759.zip
PINK: fix naming
Diffstat (limited to 'engines/pink/objects/pages')
-rw-r--r--engines/pink/objects/pages/game_page.cpp2
-rw-r--r--engines/pink/objects/pages/page.cpp6
-rw-r--r--engines/pink/objects/pages/page.h2
3 files changed, 5 insertions, 5 deletions
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; }