[Scummvm-git-logs] scummvm master -> 930f68810004e9ab453baa3724565d3c745c816e

dreammaster dreammaster at scummvm.org
Mon Feb 20 05:04:55 CET 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:
930f688100 TITANIC: Fix using ears on Titania


Commit: 930f68810004e9ab453baa3724565d3c745c816e
    https://github.com/scummvm/scummvm/commit/930f68810004e9ab453baa3724565d3c745c816e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-19T23:04:51-05:00

Commit Message:
TITANIC: Fix using ears on Titania

Changed paths:
    engines/titanic/carry/ear.cpp


diff --git a/engines/titanic/carry/ear.cpp b/engines/titanic/carry/ear.cpp
index 580ebd6..c5196dc 100644
--- a/engines/titanic/carry/ear.cpp
+++ b/engines/titanic/carry/ear.cpp
@@ -59,9 +59,11 @@ bool CEar::UseWithOtherMsg(CUseWithOtherMsg *msg) {
 		CAddHeadPieceMsg addMsg(getName());
 		if (addMsg._value != "NULL")
 			addMsg.execute(addMsg._value == "Ear1" ? "Ear1Slot" : "Ear2Slot");
-	}
 
-	return CCarry::UseWithOtherMsg(msg);
+		return true;
+	} else {
+		return CCarry::UseWithOtherMsg(msg);
+	}
 }
 
 } // End of namespace Titanic





More information about the Scummvm-git-logs mailing list