[Scummvm-git-logs] scummvm master -> d09535a4b4ea6844a8f2752f8b97f33b2bb0cf65

dreammaster dreammaster at scummvm.org
Tue Aug 30 04:45:23 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d09535a4b4 TITANIC: Remove CTrueTalkManager update2 method


Commit: d09535a4b4ea6844a8f2752f8b97f33b2bb0cf65
    https://github.com/scummvm/scummvm/commit/d09535a4b4ea6844a8f2752f8b97f33b2bb0cf65
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-29T22:43:54-04:00

Commit Message:
TITANIC: Remove CTrueTalkManager update2 method

The original was actually the update method for an audio buffer list.
This is thus unneeded in ScummVM, which automatically handles sound updates

Changed paths:
    engines/titanic/game_manager.cpp
    engines/titanic/true_talk/true_talk_manager.cpp
    engines/titanic/true_talk/true_talk_manager.h



diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 73ec5de..7d9dc37 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -164,7 +164,7 @@ void CGameManager::update() {
 	frameMessage(getRoom());
 	_timers.update(g_vm->_events->getTicksCount());
 	_trueTalkManager.removeCompleted();
-	_trueTalkManager.update2();
+
 	CScreenManager::_screenManagerPtr->_mouseCursor->update();
 
 	CViewItem *view = getView();
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index 9913f55..c5fd43e 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -219,10 +219,6 @@ void CTrueTalkManager::removeCompleted() {
 	}
 }
 
-void CTrueTalkManager::update2() {
-	//warning("CTrueTalkManager::update2");
-}
-
 void CTrueTalkManager::start(CTrueTalkNPC *npc, uint id, CViewItem *view) {
 	TTnpcScript *npcScript = getNpcScript(npc);
 	TTroomScript *roomScript = getRoomScript();
diff --git a/engines/titanic/true_talk/true_talk_manager.h b/engines/titanic/true_talk/true_talk_manager.h
index f77c964..e891f61 100644
--- a/engines/titanic/true_talk/true_talk_manager.h
+++ b/engines/titanic/true_talk/true_talk_manager.h
@@ -201,8 +201,6 @@ public:
 	 */
 	CGameManager *getGameManager() const;
 
-	void update2();
-
 	/**
 	 * Start a TrueTalk conversation
 	 */





More information about the Scummvm-git-logs mailing list