aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwhiterandrek2018-05-16 10:19:37 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commitf3ac46e8877fbcfa877ed12d4c9ea9104224ffd3 (patch)
tree62ea8e831da7da2c12a5af5c18bc8f5b013e5dfa
parent956643968383f6294ead85cebc506d25e68b4690 (diff)
downloadscummvm-rg350-f3ac46e8877fbcfa877ed12d4c9ea9104224ffd3.tar.gz
scummvm-rg350-f3ac46e8877fbcfa877ed12d4c9ea9104224ffd3.tar.bz2
scummvm-rg350-f3ac46e8877fbcfa877ed12d4c9ea9104224ffd3.zip
PINK: renamed method parameters to appropriate names in Condition classes
-rw-r--r--engines/pink/objects/condition.cpp28
-rw-r--r--engines/pink/objects/condition.h2
2 files changed, 15 insertions, 15 deletions
diff --git a/engines/pink/objects/condition.cpp b/engines/pink/objects/condition.cpp
index b0e093817e..ec9675b6e9 100644
--- a/engines/pink/objects/condition.cpp
+++ b/engines/pink/objects/condition.cpp
@@ -32,40 +32,40 @@ void Pink::ConditionVariable::deserialize(Archive &archive) {
archive >> _name >> _value;
}
-bool Pink::ConditionGameVariable::evaluate(Actor *leadActor) {
- return leadActor->getPage()->getModule()->getGame()->checkValueOfVariable(_name, _value);
+bool Pink::ConditionGameVariable::evaluate(Actor *actor) {
+ return actor->getPage()->getModule()->getGame()->checkValueOfVariable(_name, _value);
}
void ConditionGameVariable::toConsole() {
debug("\t\tConditionGameVariable: _name=%s, _value=%s", _name.c_str(), _value.c_str());
}
-bool Pink::ConditionModuleVariable::evaluate(Actor *leadActor) {
- return leadActor->getPage()->getModule()->checkValueOfVariable(_name, _value);
+bool Pink::ConditionModuleVariable::evaluate(Actor *actor) {
+ return actor->getPage()->getModule()->checkValueOfVariable(_name, _value);
}
void ConditionModuleVariable::toConsole() {
debug("\t\tConditionModuleVariable: _name=%s, _value=%s", _name.c_str(), _value.c_str());
}
-bool Pink::ConditionNotModuleVariable::evaluate(Actor *leadActor) {
- return !ConditionModuleVariable::evaluate(leadActor);
+bool Pink::ConditionNotModuleVariable::evaluate(Actor *actor) {
+ return !ConditionModuleVariable::evaluate(actor);
}
void ConditionNotModuleVariable::toConsole() {
debug("\t\tConditionNotModuleVariable: _name=%s, _value=%s", _name.c_str(), _value.c_str());
}
-bool ConditionPageVariable::evaluate(Actor *leadActor) {
- return leadActor->getPage()->checkValueOfVariable(_name, _value);
+bool ConditionPageVariable::evaluate(Actor *actor) {
+ return actor->getPage()->checkValueOfVariable(_name, _value);
}
void ConditionPageVariable::toConsole() {
debug("\t\tConditionPageVariable: _name=%s, _value=%s", _name.c_str(), _value.c_str());
}
-bool ConditionNotPageVariable::evaluate(Actor *leadActor) {
- return !ConditionPageVariable::evaluate(leadActor);
+bool ConditionNotPageVariable::evaluate(Actor *actor) {
+ return !ConditionPageVariable::evaluate(actor);
}
void ConditionNotPageVariable::toConsole() {
@@ -76,8 +76,8 @@ void ConditionInventoryItemOwner::deserialize(Archive &archive) {
archive >> _item >> _owner;
}
-bool ConditionInventoryItemOwner::evaluate(Actor *leadActor) {
- InventoryMgr *mgr = leadActor->getPage()->getModule()->getInventoryMgr();
+bool ConditionInventoryItemOwner::evaluate(Actor *actor) {
+ InventoryMgr *mgr = actor->getPage()->getModule()->getInventoryMgr();
InventoryItem *item = mgr->findInventoryItem(_item);
return item->getCurrentOwner() == _owner;
}
@@ -86,8 +86,8 @@ void ConditionInventoryItemOwner::toConsole() {
debug("\t\tConditionInventoryItemOwner: _item=%s, _owner=%s", _item.c_str(), _owner.c_str());
}
-bool ConditionNotInventoryItemOwner::evaluate(Actor *leadActor) {
- return !ConditionInventoryItemOwner::evaluate(leadActor);
+bool ConditionNotInventoryItemOwner::evaluate(Actor *actor) {
+ return !ConditionInventoryItemOwner::evaluate(actor);
}
void ConditionNotInventoryItemOwner::toConsole() {
diff --git a/engines/pink/objects/condition.h b/engines/pink/objects/condition.h
index 3ab1ff0b50..8f3b9764d3 100644
--- a/engines/pink/objects/condition.h
+++ b/engines/pink/objects/condition.h
@@ -32,7 +32,7 @@ class LeadActor;
class Condition : public Object {
public:
virtual void deserialize(Archive &archive) = 0;
- virtual bool evaluate(Actor *leadActor) = 0;
+ virtual bool evaluate(Actor *actor) = 0;
};
class ConditionVariable : public Condition {