[Scummvm-git-logs] scummvm master -> 0c7c72b75073910ba2e2ef32f5259f39d8ed2503
dreammaster
dreammaster at scummvm.org
Mon Nov 7 03:24:49 CET 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:
0c7c72b750 TITANIC: Fix showing movie clip of BellBot arriving
Commit: 0c7c72b75073910ba2e2ef32f5259f39d8ed2503
https://github.com/scummvm/scummvm/commit/0c7c72b75073910ba2e2ef32f5259f39d8ed2503
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-06T21:24:42-05:00
Commit Message:
TITANIC: Fix showing movie clip of BellBot arriving
Changed paths:
engines/titanic/game_state.cpp
engines/titanic/npcs/bellbot.cpp
diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp
index 8eae028..ecff021 100644
--- a/engines/titanic/game_state.cpp
+++ b/engines/titanic/game_state.cpp
@@ -35,7 +35,6 @@ bool CGameStateMovieList::clear() {
++i;
} else {
i = erase(i);
- delete movieItem;
}
}
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 25fa7eb..2514d20 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -79,7 +79,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
for (idx = 0; idx < 8; ++idx) {
if (compareRoomNameTo(ROOM_WAVES[idx][0])) {
playSound(ROOM_WAVES[idx][1]);
-
+ break;
}
}
if (idx == 8)
More information about the Scummvm-git-logs
mailing list