From d690ca322c04ee2044b7502369c5cc104a0c7b76 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Jul 2016 18:10:34 -0400
Subject: TITANIC: Cleanup of CTimeEventInfo class

---
 engines/titanic/core/game_object.cpp | 8 ++++----
 engines/titanic/core/game_object.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/titanic/core')

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
-- 
cgit v1.2.3