[Scummvm-git-logs] scummvm master -> 720e146051b1bdeae1246005317aee8992ad459b

[dreammaster]

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:
720e146051 TITANIC: Fix second vision center appearing in bar


Commit: 720e146051b1bdeae1246005317aee8992ad459b
    https://github.com/scummvm/scummvm/commit/720e146051b1bdeae1246005317aee8992ad459b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-28T21:40:02-04:00

Commit Message:
TITANIC: Fix second vision center appearing in bar

Changed paths:
    engines/titanic/npcs/barbot.cpp


diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp
index 489ed39..21644bc 100644
--- a/engines/titanic/npcs/barbot.cpp
+++ b/engines/titanic/npcs/barbot.cpp
@@ -406,8 +406,10 @@ bool CBarbot::MovieEndMsg(CMovieEndMsg *msg) {
 	}
 
 	if (msg->_endFrame == _frames[58]._endFrame || msg->_endFrame == _frames[21]._endFrame) {
-		CVisibleMsg visibleMsg(true);
-		visibleMsg.execute("BarShelfVisCentre");
+		if (!_gottenDrunk) {
+			CVisibleMsg visibleMsg(true);
+			visibleMsg.execute("BarShelfVisCentre");
+		}
 	}
 
 	if (msg->_endFrame == _frames[57]._endFrame) {