diff options
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_conversations.cpp | 8 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_conversations.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp index d2efdcf2e4..4e2d905960 100644 --- a/engines/titanic/pet_control/pet_conversations.cpp +++ b/engines/titanic/pet_control/pet_conversations.cpp @@ -432,7 +432,7 @@ void CPetConversations::stopNPCTimer() { _petControl->stopPetTimer(1); } -TTNpcScript *CPetConversations::getNPCScript(const CString &name) const { +TTnpcScript *CPetConversations::getNPCScript(const CString &name) const { if (name.empty() || !_petControl) return nullptr; CGameManager *gameManager = _petControl->getGameManager(); @@ -517,13 +517,13 @@ void CPetConversations::copyColors(uint tableNum, uint colors[5]) { } void CPetConversations::updateDial(uint dialNum, const CString &npcName) { - TTNpcScript *script = getNPCScript(npcName); + TTnpcScript *script = getNPCScript(npcName); uint newLevel = getDialLevel(dialNum, script); npcDialChange(dialNum, _npcLevels[dialNum], newLevel); _npcLevels[dialNum] = newLevel; } -uint CPetConversations::getDialLevel(uint dialNum, TTNpcScript *script, int v) { +uint CPetConversations::getDialLevel(uint dialNum, TTnpcScript *script, int v) { bool flag = v != 0; if (!script) @@ -559,7 +559,7 @@ void CPetConversations::npcDialChange(uint dialNum, int oldLevel, int newLevel) } void CPetConversations::resetDials(const CString &name) { - TTNpcScript *script = getNPCScript(name); + TTnpcScript *script = getNPCScript(name); for (int idx = 0; idx < TOTAL_DIALS; ++idx) { uint oldLevel = _npcLevels[idx]; diff --git a/engines/titanic/pet_control/pet_conversations.h b/engines/titanic/pet_control/pet_conversations.h index 4073360a37..b88ddfacd5 100644 --- a/engines/titanic/pet_control/pet_conversations.h +++ b/engines/titanic/pet_control/pet_conversations.h @@ -112,7 +112,7 @@ private: /** * Get the TrueTalk script associated with a given NPC */ - TTNpcScript *getNPCScript(const CString &name) const; + TTnpcScript *getNPCScript(const CString &name) const; /** * Handle a keypress @@ -142,7 +142,7 @@ private: /** * Get a dial level */ - uint getDialLevel(uint dialNum, TTNpcScript *script, int v = 1); + uint getDialLevel(uint dialNum, TTnpcScript *script, int v = 1); /** * Called when the dial for an NPC is being changed |