[Scummvm-git-logs] scummvm master -> 9272a6a437a2a87a92486bad066b9f519c7e07d6

dreammaster dreammaster at scummvm.org
Fri Nov 11 02:04:39 CET 2016


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:
c0b95cd234 TITANIC: Fix to start conversation with LiftBot
9272a6a437 TITANIC: Play speech at full volume


Commit: c0b95cd234a82d8d782d2e2fa9d4cb9f80e23b22
    https://github.com/scummvm/scummvm/commit/c0b95cd234a82d8d782d2e2fa9d4cb9f80e23b22
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-10T20:03:57-05:00

Commit Message:
TITANIC: Fix to start conversation with LiftBot

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



diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp
index 04448fc..105c4aa 100644
--- a/engines/titanic/npcs/liftbot.cpp
+++ b/engines/titanic/npcs/liftbot.cpp
@@ -79,13 +79,12 @@ bool CLiftBot::EnterViewMsg(CEnterViewMsg *msg) {
 	CPetControl *pet = getPetControl();
 	if (!_enabled && pet->getRoomsElevatorNum() == 4) {
 		loadFrame(700);
-	} else if (!_flag) {
-		if (getName() != "LiftBot") {
-			CViewItem *view = findView();
-			setTalking(this, true, view);
-			petSetArea(PET_CONVERSATION);
-			_flag = 1;
-		}
+	} else if (!_flag && getName() == "LiftBot") {
+		// First time meeting the LiftBot
+		CViewItem *view = findView();
+		setTalking(this, true, view);
+		petSetArea(PET_CONVERSATION);
+		_flag = 1;
 	}
 
 	return true;


Commit: 9272a6a437a2a87a92486bad066b9f519c7e07d6
    https://github.com/scummvm/scummvm/commit/9272a6a437a2a87a92486bad066b9f519c7e07d6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-10T20:04:31-05:00

Commit Message:
TITANIC: Play speech at full volume

Changed paths:
    engines/titanic/true_talk/true_talk_manager.cpp



diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index 32360f1..fbb9d17 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -514,7 +514,9 @@ void CTrueTalkManager::playSpeech(TTtalker *talker, TTroomScript *roomScript, CV
 	_gameManager->_sound.stopChannel(p1._channelMode);
 	if (view) {
 		p1._positioningMode = POSMODE_VECTOR;
+#if 0
 		view->getPosition(p1._posX, p1._posY, p1._posZ);
+#endif
 	}
 
 	// Loop through adding each of the speech portions in. We use the





More information about the Scummvm-git-logs mailing list