[Scummvm-git-logs] scummvm master -> 2e0e0f2d89593282f753ef2676724d71f5e969bf

dreammaster dreammaster at scummvm.org
Mon Nov 7 05:05:17 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:
2e0e0f2d89 TITANIC: Fix BellBot walking off


Commit: 2e0e0f2d89593282f753ef2676724d71f5e969bf
    https://github.com/scummvm/scummvm/commit/2e0e0f2d89593282f753ef2676724d71f5e969bf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-06T23:05:11-05:00

Commit Message:
TITANIC: Fix BellBot walking off

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



diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 606a957..3c3efe1 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -620,10 +620,13 @@ bool CPetControl::dismissBot(const CString &name) {
 	CDismissBotMsg dismissMsg;
 	for (CTreeItem *treeItem = view->getFirstChild(); treeItem;
 			treeItem = treeItem->scan(view)) {
-		if (!treeItem->getName().compareToIgnoreCase(name))
-			dismissMsg.execute(treeItem);
-		else
-			result = true;
+		CGameObject *obj = dynamic_cast<CGameObject *>(treeItem);
+		if (obj) {
+			if (!obj->getName().compareToIgnoreCase(name))
+				result = true;
+			else
+				dismissMsg.execute(treeItem);
+		}
 	}
 
 	return result;





More information about the Scummvm-git-logs mailing list