PINK: fix naming

scummvm · Jun 28, 2018 · 9b8d72b · 9b8d72b
1 parent 861ef3b
commit 9b8d72b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -48,7 +48,7 @@ class Actor : public NamedObject {
 	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
@@ -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
@@ -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
@@ -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
@@ -41,7 +41,7 @@ class Page : public NamedObject {
 
 	void load(Archive &archive);
 	void init();
-	void initPallete();
+	void initPalette();
 
 	Actor *findActor(const Common::String &name);
 	LeadActor *getLeadActor() { return _leadActor; }