aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-29 22:43:54 -0400
committerPaul Gilbert2016-08-29 22:43:54 -0400
commitd09535a4b4ea6844a8f2752f8b97f33b2bb0cf65 (patch)
tree0529958edee1629fc658f58478ec2c3288d0ff37
parent6a8ee95dbabbdd0355284d4dce1db0df9b1b361b (diff)
downloadscummvm-rg350-d09535a4b4ea6844a8f2752f8b97f33b2bb0cf65.tar.gz
scummvm-rg350-d09535a4b4ea6844a8f2752f8b97f33b2bb0cf65.tar.bz2
scummvm-rg350-d09535a4b4ea6844a8f2752f8b97f33b2bb0cf65.zip
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
-rw-r--r--engines/titanic/game_manager.cpp2
-rw-r--r--engines/titanic/true_talk/true_talk_manager.cpp4
-rw-r--r--engines/titanic/true_talk/true_talk_manager.h2
3 files changed, 1 insertions, 7 deletions
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 73ec5de993..7d9dc37a10 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 9913f55a8d..c5fd43ebfd 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 f77c9640db..e891f6112a 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
*/