aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-23 18:10:34 -0400
committerPaul Gilbert2016-07-23 18:10:34 -0400
commitd690ca322c04ee2044b7502369c5cc104a0c7b76 (patch)
tree62e2dbf89fa413b3cba6aca5c76a5dd0c7b033f0 /engines/titanic/core
parentd979dcd020d65aa0019d7a53c1dcd8b4f4a0f909 (diff)
downloadscummvm-rg350-d690ca322c04ee2044b7502369c5cc104a0c7b76.tar.gz
scummvm-rg350-d690ca322c04ee2044b7502369c5cc104a0c7b76.tar.bz2
scummvm-rg350-d690ca322c04ee2044b7502369c5cc104a0c7b76.zip
TITANIC: Cleanup of CTimeEventInfo class
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp8
-rw-r--r--engines/titanic/core/game_object.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 4f9a2a5c9f..d33a0c928b 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -659,17 +659,17 @@ void CGameObject::stopSound(int handle, int val2) {
}
}
-int CGameObject::addTimer(int endVal, uint firstDuration, uint duration) {
+int CGameObject::addTimer(int endVal, uint firstDuration, uint repeatDuration) {
CTimeEventInfo *timer = new CTimeEventInfo(g_vm->_events->getTicksCount(),
- duration != 0, firstDuration, duration, this, endVal, CString());
+ repeatDuration != 0, firstDuration, repeatDuration, this, endVal, CString());
getGameManager()->addTimer(timer);
return timer->_id;
}
-int CGameObject::addTimer(uint firstDuration, uint duration) {
+int CGameObject::addTimer(uint firstDuration, uint repeatDuration) {
CTimeEventInfo *timer = new CTimeEventInfo(g_vm->_events->getTicksCount(),
- duration != 0, firstDuration, duration, this, 0, CString());
+ repeatDuration != 0, firstDuration, repeatDuration, this, 0, CString());
getGameManager()->addTimer(timer);
return timer->_id;
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 3f77776bf5..bde5e25c58 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -210,12 +210,12 @@ protected:
/**
* Adds a timer
*/
- int addTimer(int endVal, uint firstDuration, uint duration);
+ int addTimer(int endVal, uint firstDuration, uint repeatDuration);
/**
* Adds a timer
*/
- int addTimer(uint firstDuration, uint duration);
+ int addTimer(uint firstDuration, uint repeatDuration);
/**
* Stops a timer