aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/condition.h
diff options
context:
space:
mode:
authorwhiterandrek2018-04-02 08:57:56 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commit49d5ea28c023a43f7d1444b55ac8c06df9966128 (patch)
tree37db0a106b33970b934243f8c48adcb12c12255e /engines/pink/objects/condition.h
parente48ac17f68ccd1b4432d9d6e15e811a88ea8daf4 (diff)
downloadscummvm-rg350-49d5ea28c023a43f7d1444b55ac8c06df9966128.tar.gz
scummvm-rg350-49d5ea28c023a43f7d1444b55ac8c06df9966128.tar.bz2
scummvm-rg350-49d5ea28c023a43f7d1444b55ac8c06df9966128.zip
PINK: added basic cursor implementation, fixed sequenceAudio restarting and skipping, fixed various mem leaks, hopefully fixed finding of transparent color index.
Diffstat (limited to 'engines/pink/objects/condition.h')
-rw-r--r--engines/pink/objects/condition.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/pink/objects/condition.h b/engines/pink/objects/condition.h
index 6df1920046..3ab1ff0b50 100644
--- a/engines/pink/objects/condition.h
+++ b/engines/pink/objects/condition.h
@@ -32,14 +32,14 @@ class LeadActor;
class Condition : public Object {
public:
virtual void deserialize(Archive &archive) = 0;
- virtual bool evaluate(LeadActor *leadActor) = 0;
+ virtual bool evaluate(Actor *leadActor) = 0;
};
class ConditionVariable : public Condition {
public:
virtual void deserialize(Archive &archive);
- virtual bool evaluate(LeadActor *leadActor) = 0;
+ virtual bool evaluate(Actor *actor) = 0;
protected:
Common::String _name;
@@ -49,7 +49,7 @@ protected:
class ConditionGameVariable : public ConditionVariable {
public:
virtual void toConsole();
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
};
/*
@@ -62,32 +62,32 @@ class ConditionNotGameVariable : public ConditionGameVariable {
class ConditionModuleVariable : public ConditionVariable {
public:
virtual void toConsole();
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
};
class ConditionNotModuleVariable : public ConditionModuleVariable {
public:
virtual void toConsole();
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
};
class ConditionPageVariable : public ConditionVariable {
public:
virtual void toConsole();
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
};
class ConditionNotPageVariable : public ConditionPageVariable {
public:
virtual void toConsole();
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
};
class ConditionInventoryItemOwner : public Condition {
public:
virtual void toConsole();
virtual void deserialize(Archive &archive);
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
protected:
Common::String _item;
@@ -97,7 +97,7 @@ protected:
class ConditionNotInventoryItemOwner : public ConditionInventoryItemOwner {
public:
virtual void toConsole();
- virtual bool evaluate(LeadActor *leadActor);
+ virtual bool evaluate(Actor *actor);
};
} // End of namespace Pink