[Scummvm-git-logs] scummvm master -> 1fcb79093c0c757dd1fbcd642cc8a48f5dca7b89

[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:
1fcb79093c TITANIC: Fix breaking long stick dispensor glass with hammer


Commit: 1fcb79093c0c757dd1fbcd642cc8a48f5dca7b89
    https://github.com/scummvm/scummvm/commit/1fcb79093c0c757dd1fbcd642cc8a48f5dca7b89
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-13T21:01:42-05:00

Commit Message:
TITANIC: Fix breaking long stick dispensor glass with hammer

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


diff --git a/engines/titanic/game/long_stick_dispenser.cpp b/engines/titanic/game/long_stick_dispenser.cpp
index e0c698c..bf2dae5 100644
--- a/engines/titanic/game/long_stick_dispenser.cpp
+++ b/engines/titanic/game/long_stick_dispenser.cpp
@@ -56,12 +56,12 @@ void CLongStickDispenser::load(SimpleFile *file) {
 }
 
 bool CLongStickDispenser::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) {
-	if (!_fieldBC && !_fieldC4 && !_fieldC0) {
+	if (!_fieldBC && _fieldC4 == 1 && !_fieldC0) {
 		CStatusChangeMsg statusMsg;
 		statusMsg.execute("ShatterGlass");
 		_fieldC0 = 1;
 		loadFrame(19);
-	} else if (_fieldC0) {
+	} else if (_fieldC0 != 1) {
 		playSound(g_vm->isGerman() ? "z#594.wav" : "z#63.wav");
 		petDisplayMessage(1, GLASS_IS_UNBREAKABLE);
 	}