diff options
| author | Paul Gilbert | 2016-05-07 22:24:46 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-10 16:38:47 -0400 |
| commit | 0cbd9f5063715a35196c40d0e92a21e73b9f15e2 (patch) | |
| tree | e2a55b87d4f8c383ac7295a5f8f1adc01eae71e6 /engines/titanic/pet_control | |
| parent | e85b171db811d1dac22c2411299b2ce0da7effeb (diff) | |
| download | scummvm-rg350-0cbd9f5063715a35196c40d0e92a21e73b9f15e2.tar.gz scummvm-rg350-0cbd9f5063715a35196c40d0e92a21e73b9f15e2.tar.bz2 scummvm-rg350-0cbd9f5063715a35196c40d0e92a21e73b9f15e2.zip | |
TITANIC: Changing TTNamed* classes to TTNpc*
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 9b7b27799f..d2efdcf2e4 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); } -TTNamedScript *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) { - TTNamedScript *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, TTNamedScript *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) { - TTNamedScript *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 9ddc610058..4073360a37 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 */ - TTNamedScript *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, TTNamedScript *script, int v = 1); + uint getDialLevel(uint dialNum, TTNpcScript *script, int v = 1); /** * Called when the dial for an NPC is being changed |