aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fry2018-04-29 00:13:04 +1000
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commit28b0acc6c22efcb7c7cad6514c706e6b81e979d9 (patch)
tree749149aff625e9fe939cb3a099d25d6b293163f5
parent43ba5f6327c21e60c9c73b2f2f93e71dbde7bf08 (diff)
downloadscummvm-rg350-28b0acc6c22efcb7c7cad6514c706e6b81e979d9.tar.gz
scummvm-rg350-28b0acc6c22efcb7c7cad6514c706e6b81e979d9.tar.bz2
scummvm-rg350-28b0acc6c22efcb7c7cad6514c706e6b81e979d9.zip
ILLUSIONS: Fix bug when setting property timers.
Illusions engine variable wasn't wired up
-rw-r--r--engines/illusions/duckman/propertytimers.cpp1
-rw-r--r--engines/illusions/duckman/propertytimers.h5
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/illusions/duckman/propertytimers.cpp b/engines/illusions/duckman/propertytimers.cpp
index 47d8cb47c4..cdfdd927a3 100644
--- a/engines/illusions/duckman/propertytimers.cpp
+++ b/engines/illusions/duckman/propertytimers.cpp
@@ -32,6 +32,7 @@ namespace Illusions {
// PropertyTimers
PropertyTimers::PropertyTimers(IllusionsEngine_Duckman *vm) {
+ _vm = vm;
_propertyTimersActive = false;
_propertyTimersPaused = false;
}
diff --git a/engines/illusions/duckman/propertytimers.h b/engines/illusions/duckman/propertytimers.h
index d4b73060ee..0c4d378a77 100644
--- a/engines/illusions/duckman/propertytimers.h
+++ b/engines/illusions/duckman/propertytimers.h
@@ -45,11 +45,12 @@ class PropertyTimers {
public:
PropertyTimers(IllusionsEngine_Duckman *vm);
~PropertyTimers();
-public:
- IllusionsEngine_Duckman *_vm;
+private:
+ IllusionsEngine_Duckman *_vm;
PropertyTimer _propertyTimers[kPropertyTimersCount];
bool _propertyTimersActive;
bool _propertyTimersPaused;
+public:
void addPropertyTimer(uint32 propertyId);
void setPropertyTimer(uint32 propertyId, uint32 duration);
void removePropertyTimer(uint32 propertyId);