[Scummvm-git-logs] scummvm master -> 0343c0d3378fac49af4e0e0c8c82d4bf3c6404b6

dreammaster dreammaster at scummvm.org
Sat Feb 18 23:06:35 CET 2017


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d65c717a44 TITANIC: Workaround original Maitre'D bug where _musicHandler was null
0343c0d337 TITANIC: Fix adding held items to inventory after unlocking arms


Commit: d65c717a448d9afe9dc820756fa16e835d31176e
    https://github.com/scummvm/scummvm/commit/d65c717a448d9afe9dc820756fa16e835d31176e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-18T17:06:00-05:00

Commit Message:
TITANIC: Workaround original Maitre'D bug where _musicHandler was null

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


diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp
index 0e2f62c..6ac69d9 100644
--- a/engines/titanic/npcs/maitre_d.cpp
+++ b/engines/titanic/npcs/maitre_d.cpp
@@ -119,6 +119,11 @@ bool CMaitreD::EnterViewMsg(CEnterViewMsg *msg) {
 	if (_musicName != "STMusic" && (!_musicSet || _priorMusicName == _musicName))
 		return true;
 
+	// WORKAROUND: It's possible in the original to not have a music handler set
+	// if you start and stop the phonograph, then save and restore the game
+	if (!CMusicRoom::_musicHandler)
+		return true;
+
 	if (_musicName.contains("nasty ambient"))
 		startTalking(this, 111, findView());
 	else if (!CMusicRoom::_musicHandler->checkInstrument(SNAKE))


Commit: 0343c0d3378fac49af4e0e0c8c82d4bf3c6404b6
    https://github.com/scummvm/scummvm/commit/0343c0d3378fac49af4e0e0c8c82d4bf3c6404b6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-18T17:06:30-05:00

Commit Message:
TITANIC: Fix adding held items to inventory after unlocking arms

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


diff --git a/engines/titanic/carry/arm.cpp b/engines/titanic/carry/arm.cpp
index a843b5b..e7d340d 100644
--- a/engines/titanic/carry/arm.cpp
+++ b/engines/titanic/carry/arm.cpp
@@ -164,10 +164,10 @@ bool CArm::MaitreDHappyMsg(CMaitreDHappyMsg *msg) {
 		if (!_armUnlocked)
 			playSound("z#47.wav");
 		if (_heldItemName == "Key" || _heldItemName == "AuditoryCentre") {
-			CGameObject *child = dynamic_cast<CGameObject *>(getFirstChild());
-			if (child) {
-				child->setVisible(true);
-				petAddToInventory();
+			CGameObject *heldItem = dynamic_cast<CGameObject *>(getFirstChild());
+			if (heldItem) {
+				heldItem->setVisible(true);
+				heldItem->petAddToInventory();
 			}
 
 			_visibleFrame = _unlockedFrame;





More information about the Scummvm-git-logs mailing list