TITANIC: Implemented more game classes

2 files changed, 12 insertions, 3 deletions

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 29a6fd2209..3126aac228 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -797,6 +797,10 @@ int CGameObject::addTimer(uint firstDuration, uint repeatDuration) {
 	return timer->_id;
 }
 
+void CGameObject::stopTimer(int id) {
+	getGameManager()->stopTimer(id);
+}
+
 int CGameObject::startAnimTimer(const CString &action, uint firstDuration, uint repeatDuration) {
 	CTimeEventInfo *timer = new CTimeEventInfo(getTicksCount(), repeatDuration > 0,
 		firstDuration, repeatDuration, this, 0, action);
@@ -805,7 +809,7 @@ int CGameObject::startAnimTimer(const CString &action, uint firstDuration, uint
 	return timer->_id;
 }
 
-void CGameObject::stopTimer(int id) {
+void CGameObject::stopAnimTimer(int id) {
 	getGameManager()->stopTimer(id);
 }
 
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index e2170a81d5..cb6a8529fb 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -261,14 +261,19 @@ protected:
 	int addTimer(uint firstDuration, uint repeatDuration = 0);
 
 	/**
+	 * Stops a timer
+	 */
+	void stopTimer(int id);
+
+	/**
 	 * Start an animation timer
 	 */
 	int startAnimTimer(const CString &action, uint firstDuration, uint repeatDuration = 0);
 
 	/**
-	 * Stops a timer
+	 * Stop an animation timer
 	 */
-	void stopTimer(int id);
+	void stopAnimTimer(int id);
 
 	/**
 	 * Causes the game to sleep for the specified time