[Scummvm-git-logs] scummvm master -> 40818ac86ba253168876d01b4350cebd969d6c2f

dreammaster dreammaster at scummvm.org
Sun Jul 30 03:20:51 CEST 2017


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:
40818ac86b TITANIC: Fix Bomb Explosion ending


Commit: 40818ac86ba253168876d01b4350cebd969d6c2f
    https://github.com/scummvm/scummvm/commit/40818ac86ba253168876d01b4350cebd969d6c2f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-29T21:20:40-04:00

Commit Message:
TITANIC: Fix Bomb Explosion ending

Changed paths:
    engines/titanic/game/end_explode_ship.cpp


diff --git a/engines/titanic/game/end_explode_ship.cpp b/engines/titanic/game/end_explode_ship.cpp
index 633e47e..2de9192 100644
--- a/engines/titanic/game/end_explode_ship.cpp
+++ b/engines/titanic/game/end_explode_ship.cpp
@@ -76,7 +76,7 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) {
 		actMsg.execute("EndGameCredits");
 	}
 
-	if (msg->_action == "Room") {
+	if (msg->_action == "Boom") {
 		playMovie(550, 583, MOVIE_NOTIFY_OBJECT);
 		movieEvent(551);
 	}
@@ -85,7 +85,7 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) {
 }
 
 bool CEndExplodeShip::MovieEndMsg(CMovieEndMsg *msg) {
-	if (getMovieFrame() == 550) {
+	if (msg->_endFrame == 550) {
 		playSound("z#399.wav");
 		startAnimTimer("Boom", 4200, 0);
 	} else {





More information about the Scummvm-git-logs mailing list