aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects
diff options
context:
space:
mode:
authorAndrei Prykhodko2018-06-29 14:26:22 +0300
committerAndrei Prykhodko2018-06-29 14:43:57 +0300
commit0c1ef839b6505faac77cf8ebc5540cf4fccf9a87 (patch)
tree3d521446ba811bbae0d05b143d8fca76b11c86bd /engines/pink/objects
parent34319e3ac62d7c2dab592c9b85212eb992b1233b (diff)
downloadscummvm-rg350-0c1ef839b6505faac77cf8ebc5540cf4fccf9a87.tar.gz
scummvm-rg350-0c1ef839b6505faac77cf8ebc5540cf4fccf9a87.tar.bz2
scummvm-rg350-0c1ef839b6505faac77cf8ebc5540cf4fccf9a87.zip
PINK: added more constants
Diffstat (limited to 'engines/pink/objects')
-rw-r--r--engines/pink/objects/actors/lead_actor.cpp6
-rw-r--r--engines/pink/objects/module.cpp2
-rw-r--r--engines/pink/objects/pages/game_page.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index e30fcb937b..be0e91a669 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -436,7 +436,7 @@ void ParlSqPink::toConsole() {
}
WalkLocation *ParlSqPink::getWalkDestination() {
- if (_recipient->getName() == kBoy && _page->checkValueOfVariable(kBoyBlocked, "UNDEFINED"))
+ if (_recipient->getName() == kBoy && _page->checkValueOfVariable(kBoyBlocked, kUndefinedValue))
return _walkMgr->findLocation(kSirBaldley);
return LeadActor::getWalkDestination();
@@ -492,8 +492,8 @@ WalkLocation *PubPink::getWalkDestination() {
}
bool PubPink::playingMiniGame() {
- return !(_page->checkValueOfVariable(kFoodPuzzle, "TRUE") ||
- _page->checkValueOfVariable(kFoodPuzzle, "UNDEFINED"));
+ return !(_page->checkValueOfVariable(kFoodPuzzle, kTrueValue) ||
+ _page->checkValueOfVariable(kFoodPuzzle, kUndefinedValue));
}
} // End of namespace Pink
diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp
index b1f10873ae..50a256db81 100644
--- a/engines/pink/objects/module.cpp
+++ b/engines/pink/objects/module.cpp
@@ -79,7 +79,7 @@ GamePage *Module::findPage(const Common::String &pageName) const {
bool Module::checkValueOfVariable(Common::String &variable, Common::String &value) {
if (!_variables.contains(variable))
- return value == "UNDEFINED";
+ return value == kUndefinedValue;
return _variables[variable] == value;
}
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp
index 5b69be1dd3..1157d96f4e 100644
--- a/engines/pink/objects/pages/game_page.cpp
+++ b/engines/pink/objects/pages/game_page.cpp
@@ -121,7 +121,7 @@ void GamePage::loadManagers() {
bool GamePage::checkValueOfVariable(const Common::String &variable, const Common::String &value) {
if (!_variables.contains(variable))
- return value == "UNDEFINED";
+ return value == kUndefinedValue;
return _variables[variable] == value;
}