[Scummvm-git-logs] scummvm master -> 11f9af68c94303d29b420f53414d9a8fc840b328

dreammaster dreammaster at scummvm.org
Mon Nov 7 02:52:42 CET 2016


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:
11f9af68c9 TITANIC: Fix triggering BellBot summon


Commit: 11f9af68c94303d29b420f53414d9a8fc840b328
    https://github.com/scummvm/scummvm/commit/11f9af68c94303d29b420f53414d9a8fc840b328
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-06T20:52:36-05:00

Commit Message:
TITANIC: Fix triggering BellBot summon

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/pet_control/pet_control.cpp



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index a882039..76a2f2d 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1613,7 +1613,7 @@ void CGameObject::petSetRooms1D4(int v) {
 void CGameObject::petOnSummonBot(const CString &name, int val) {
 	CPetControl *pet = getPetControl();
 	if (pet)
-		pet->summonBot(name, val);
+		pet->onSummonBot(name, val);
 }
 
 void CGameObject::petUnlockInput() {
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 294a99b..606a957 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -604,6 +604,7 @@ void CPetControl::onSummonBot(const CString &name, int val) {
 
 		COnSummonBotMsg summonMsg(val);
 		summonMsg.execute(bot);
+		makeDirty();
 	}
 }
 





More information about the Scummvm-git-logs mailing list