aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/carry/carry_parrot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/carry/carry_parrot.cpp')
-rw-r--r--engines/titanic/carry/carry_parrot.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index 598393bb08..6bf536ea7a 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -167,9 +167,9 @@ bool CCarryParrot::PassOnDragStartMsg(CPassOnDragStartMsg *msg) {
return CCarry::PassOnDragStartMsg(msg);
}
- CTreeItem *treeItem = getRoot()->findByName(_string6);
- if (treeItem)
- trueTalkFn1(treeItem, 0x446BF, 0);
+ CGameObject *npc = static_cast<CGameObject *>(getRoot()->findByName(_string6));
+ if (npc)
+ trueTalkFn1(npc, 0x446BF, 0);
_fieldE0 = 0;
playSound("z#475.wav", 100, 0, 0);
@@ -198,9 +198,9 @@ bool CCarryParrot::UseWithCharMsg(CUseWithCharMsg *msg) {
bool CCarryParrot::ActMsg(CActMsg *msg) {
if (msg->_action == "FreeParrot" && (CParrot::_v4 == 4 || CParrot::_v4 == 1)) {
- CTreeItem *treeItem = getRoot()->findByName(_string6);
- if (treeItem)
- trueTalkFn1(treeItem, 0x446BF, 0);
+ CGameObject *npc = static_cast<CGameObject *>(getRoot()->findByName(_string6));
+ if (npc)
+ trueTalkFn1(npc, 0x446BF, 0);
setVisible(false);
_fieldE0 = 0;