diff options
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 7 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 3406de6902..1b76ec1960 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -699,15 +699,16 @@ void CGameObject::incState38() { } void CGameObject::trueTalkFn1(const CString &name, int val2, int val3) { - trueTalkFn1(getRoot()->findByName(name), val2, val3); + CGameObject *npc = static_cast<CGameObject *>(getRoot()->findByName(name)); + trueTalkFn1(npc, val2, val3); } -void CGameObject::trueTalkFn1(CTreeItem *item, int val2, int val3) { +void CGameObject::trueTalkFn1(CGameObject *npc, int val2, int val3) { CGameManager *gameManager = getGameManager(); if (gameManager) { CTrueTalkManager *talkManager = gameManager->getTalkManager(); if (talkManager) - talkManager->fn1(item, val2, val3); + talkManager->fn1(npc, val2, val3); } } diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 8a56945d13..40492676b0 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -218,7 +218,7 @@ protected: void trueTalkFn1(const CString &name, int val2, int val3); - void trueTalkFn1(CTreeItem *item, int val2, int val3); + void trueTalkFn1(CGameObject *npc, int val2, int val3); /** * Load the surface |