diff options
Diffstat (limited to 'engines/titanic')
22 files changed, 112 insertions, 112 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index aaccb77445..a0f0efb7b0 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -461,7 +461,7 @@ MODULE_OBJS := \ true_talk/true_talk_manager.o \ true_talk/tt_script_base.o \ true_talk/tt_room_script.o \ - true_talk/tt_named_script.o \ + true_talk/tt_npc_script.o \ true_talk/tt_scripts.o \ true_talk/tt_string.o \ true_talk/tt_talker.o \ 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 diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h index 2ea86f0803..18886c299b 100644 --- a/engines/titanic/true_talk/barbot_script.h +++ b/engines/titanic/true_talk/barbot_script.h @@ -23,15 +23,15 @@ #ifndef TITANIC_BARBOT_SCRIPT_H #define TITANIC_BARBOT_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class BarbotScript : public TTNamedScript { +class BarbotScript : public TTNpcScript { public: BarbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} + TTNpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} virtual int proc6() const; virtual void proc7(int v1, int v2); diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp index 52d8a19145..2042ca9bab 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -28,7 +28,7 @@ namespace Titanic { BellbotScript::BellbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0), + TTNpcScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0), _field2D0(0), _field2D4(0), _field2D8(0), _field2DC(0) { CTrueTalkManager::setFlags(25, 0); CTrueTalkManager::setFlags(24, 0); diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h index cc71c263b1..ff9f849d09 100644 --- a/engines/titanic/true_talk/bellbot_script.h +++ b/engines/titanic/true_talk/bellbot_script.h @@ -23,11 +23,11 @@ #ifndef TITANIC_BELLBOT_SCRIPT_H #define TITANIC_BELLBOT_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class BellbotScript : public TTNamedScript { +class BellbotScript : public TTNpcScript { private: int _array[150]; int _field2D0; diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp index f17c04145e..5844664a4a 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -28,7 +28,7 @@ namespace Titanic { DeskbotScript::DeskbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0) { + TTNpcScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0) { CTrueTalkManager::setFlags(18, 0); CTrueTalkManager::setFlags(19, 0); CTrueTalkManager::setFlags(20, 0); diff --git a/engines/titanic/true_talk/deskbot_script.h b/engines/titanic/true_talk/deskbot_script.h index dcab218e97..d001f56075 100644 --- a/engines/titanic/true_talk/deskbot_script.h +++ b/engines/titanic/true_talk/deskbot_script.h @@ -23,11 +23,11 @@ #ifndef TITANIC_DESKBOT_SCRIPT_H #define TITANIC_DESKBOT_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class DeskbotScript : public TTNamedScript { +class DeskbotScript : public TTNpcScript { public: DeskbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2); diff --git a/engines/titanic/true_talk/doorbot_script.h b/engines/titanic/true_talk/doorbot_script.h index 37722d4862..b52c802f23 100644 --- a/engines/titanic/true_talk/doorbot_script.h +++ b/engines/titanic/true_talk/doorbot_script.h @@ -23,17 +23,17 @@ #ifndef TITANIC_DOORBOT_SCRIPT_H #define TITANIC_DOORBOT_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class DoorbotScript : public TTNamedScript { +class DoorbotScript : public TTNpcScript { private: int _array[148]; public: DoorbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} + TTNpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} virtual int proc6() const; virtual void proc7(int v1, int v2); @@ -55,4 +55,4 @@ public: } // End of namespace Titanic -#endif /* TITANIC_TT_CHARACTER1_H */ +#endif /* TITANIC_DOORBOT_SCRIPT_H */ diff --git a/engines/titanic/true_talk/liftbot_script.h b/engines/titanic/true_talk/liftbot_script.h index 8564bb53ef..a6c3ed878b 100644 --- a/engines/titanic/true_talk/liftbot_script.h +++ b/engines/titanic/true_talk/liftbot_script.h @@ -23,15 +23,15 @@ #ifndef TITANIC_LIFTBOT_SCRIPT_H #define TITANIC_LIFTBOT_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class LiftbotScript : public TTNamedScript { +class LiftbotScript : public TTNpcScript { public: LiftbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} + TTNpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} virtual int proc6() const; virtual void proc7(int v1, int v2); diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp index b88dfc611e..47ae96ccd8 100644 --- a/engines/titanic/true_talk/maitred_script.cpp +++ b/engines/titanic/true_talk/maitred_script.cpp @@ -28,7 +28,7 @@ namespace Titanic { MaitreDScript::MaitreDScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0) { + TTNpcScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0) { CTrueTalkManager::setFlags(9, 1); CTrueTalkManager::setFlags(10, 0); CTrueTalkManager::setFlags(11, 0); diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h index a5fbb72c82..7aaddf971d 100644 --- a/engines/titanic/true_talk/maitred_script.h +++ b/engines/titanic/true_talk/maitred_script.h @@ -23,11 +23,11 @@ #ifndef TITANIC_MAITRED_SCRIPT_H #define TITANIC_MAITRED_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class MaitreDScript : public TTNamedScript { +class MaitreDScript : public TTNpcScript { public: MaitreDScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2); diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h index ac0b08c982..354f3061b3 100644 --- a/engines/titanic/true_talk/parrot_script.h +++ b/engines/titanic/true_talk/parrot_script.h @@ -23,15 +23,15 @@ #ifndef TITANIC_PARROT_SCRIPT_H #define TITANIC_PARROT_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class ParrotScript : public TTNamedScript { +class ParrotScript : public TTNpcScript { public: ParrotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} + TTNpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} virtual int proc6() const; virtual void proc7(int v1, int v2); diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp index 83d181275a..ef5814c3f2 100644 --- a/engines/titanic/true_talk/script_handler.cpp +++ b/engines/titanic/true_talk/script_handler.cpp @@ -29,11 +29,11 @@ namespace Titanic { CScriptHandler::CScriptHandler(CTitleEngine *owner, int val1, int val2) { } -void CScriptHandler::setup(TTRoomScript *roomScript, TTNamedScript *npcScript, uint charId) { +void CScriptHandler::setup(TTRoomScript *roomScript, TTNpcScript *npcScript, uint charId) { // TODO } -void CScriptHandler::processInput(TTRoomScript *roomScript, TTNamedScript *npcScript, +void CScriptHandler::processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, const TTString &line) { if (!roomScript || line.empty()) return; diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 1206afe48e..6a1e0dc0f1 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -23,7 +23,7 @@ #ifndef TITANIC_SCRIPT_HANDLER_H #define TITANIC_SCRIPT_HANDLER_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" @@ -40,9 +40,9 @@ public: /** * Set the character and room */ - void setup(TTRoomScript *roomScript, TTNamedScript *npcScript, uint charId); + void setup(TTRoomScript *roomScript, TTNpcScript *npcScript, uint charId); - void processInput(TTRoomScript *roomScript, TTNamedScript *npcScript, + void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, const TTString &line); }; diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h index 2131775fa5..0aba07ecd0 100644 --- a/engines/titanic/true_talk/succubus_script.h +++ b/engines/titanic/true_talk/succubus_script.h @@ -23,17 +23,17 @@ #ifndef TITANIC_SUCCUBUS_SCRIPT_H #define TITANIC_SUCCUBUS_SCRIPT_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" namespace Titanic { -class SuccUBusScript : public TTNamedScript { +class SuccUBusScript : public TTNpcScript { private: int _field2D0; public: SuccUBusScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTNamedScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7), + TTNpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7), _field2D0(0) {} virtual int proc6() const; diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index 2bbac3b0f8..d4674233dc 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -177,13 +177,13 @@ void CTrueTalkManager::setFlags(int index, int val) { } void CTrueTalkManager::loadNPC(SimpleFile *file, int charId) { - TTNamedScript *script = _scripts.getNamedScript(charId); + TTNpcScript *script = _scripts.getNamedScript(charId); if (script) script->load(file); } void CTrueTalkManager::saveNPC(SimpleFile *file, int charId) const { - TTNamedScript *script = _scripts.getNamedScript(charId); + TTNpcScript *script = _scripts.getNamedScript(charId); if (script) { script->save(file); file->writeNumber(MKTAG_BE('U', 'R', 'A', 'H')); @@ -216,7 +216,7 @@ void CTrueTalkManager::update2() { } void CTrueTalkManager::start(CTrueTalkNPC *npc, uint id, CViewItem *view) { - TTNamedScript *npcScript = getNpcScript(npc); + TTNpcScript *npcScript = getNpcScript(npc); TTRoomScript *roomScript = getRoomScript(); _titleEngine.reset(); @@ -230,7 +230,7 @@ void CTrueTalkManager::start(CTrueTalkNPC *npc, uint id, CViewItem *view) { setDialogue(npc, roomScript, view); } -TTNamedScript *CTrueTalkManager::getTalker(const CString &name) const { +TTNpcScript *CTrueTalkManager::getTalker(const CString &name) const { if (name.contains("Doorbot")) return _scripts.getNamedScript(104); else if (name.contains("DeskBot")) @@ -253,9 +253,9 @@ TTNamedScript *CTrueTalkManager::getTalker(const CString &name) const { return nullptr; } -TTNamedScript *CTrueTalkManager::getNpcScript(CTrueTalkNPC *npc) const { +TTNpcScript *CTrueTalkManager::getNpcScript(CTrueTalkNPC *npc) const { CString npcName = npc->getName(); - TTNamedScript *script = getTalker(npcName); + TTNpcScript *script = getTalker(npcName); if (!script) { // Fall back on the default NPC script @@ -301,7 +301,7 @@ void CTrueTalkManager::loadAssets(CTrueTalkNPC *npc, int charId) { } void CTrueTalkManager::processInput(CTrueTalkNPC *npc, CTextInputMsg *msg, CViewItem *view) { - TTNamedScript *npcScript = getNpcScript(npc); + TTNpcScript *npcScript = getNpcScript(npc); TTRoomScript *roomScript = getRoomScript(); _titleEngine.reset(); diff --git a/engines/titanic/true_talk/true_talk_manager.h b/engines/titanic/true_talk/true_talk_manager.h index a7933be47f..071291964e 100644 --- a/engines/titanic/true_talk/true_talk_manager.h +++ b/engines/titanic/true_talk/true_talk_manager.h @@ -72,7 +72,7 @@ private: /** * Gets the script associated with an NPC game object */ - TTNamedScript *getNpcScript(CTrueTalkNPC *npc) const; + TTNpcScript *getNpcScript(CTrueTalkNPC *npc) const; /** * Gets the script associated with the current room @@ -186,7 +186,7 @@ public: /** * Return a TrueTalk talker/script */ - TTNamedScript *getTalker(const CString &name) const; + TTNpcScript *getTalker(const CString &name) const; /** * Process player's input diff --git a/engines/titanic/true_talk/tt_named_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp index 9d253206e2..dfe8ac0ada 100644 --- a/engines/titanic/true_talk/tt_named_script.cpp +++ b/engines/titanic/true_talk/tt_npc_script.cpp @@ -21,12 +21,12 @@ */ #include "common/textconsole.h" -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/true_talk_manager.h" namespace Titanic { -TTNamedScriptBase::TTNamedScriptBase(int charId, const char *charClass, int v2, +TTNpcScriptBase::TTNpcScriptBase(int charId, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : TTScriptBase(0, charClass, v2, charName, v3, v4, v5, v6, v7), _charId(charId), _field54(0), _val2(val2) { @@ -34,9 +34,9 @@ TTNamedScriptBase::TTNamedScriptBase(int charId, const char *charClass, int v2, /*------------------------------------------------------------------------*/ -TTNamedScript::TTNamedScript(int charId, const char *charClass, int v2, +TTNpcScript::TTNpcScript(int charId, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTNamedScriptBase(charId, charClass, v2, charName, v3, val2, v4, v5, v6, v7), + TTNpcScriptBase(charId, charClass, v2, charName, v3, val2, v4, v5, v6, v7), _subPtr(nullptr), _field60(0), _field64(0), _field68(0), _field6C(0), _field70(0), _field74(0), _field78(0), _field7C(0), _field80(0) { @@ -51,99 +51,99 @@ TTNamedScript::TTNamedScript(int charId, const char *charClass, int v2, resetFlags(); } -void TTNamedScript::resetFlags() { +void TTNpcScript::resetFlags() { Common::fill(&_array[26], &_array[146], 0); } -void TTNamedScript::randomizeFlags() { +void TTNpcScript::randomizeFlags() { warning("TODO"); } -void TTNamedScript::proc4(int v) { +void TTNpcScript::proc4(int v) { warning("TODO"); } -int TTNamedScript::proc6() const { +int TTNpcScript::proc6() const { return 1; } -void TTNamedScript::proc7(int v1, int v2) { +void TTNpcScript::proc7(int v1, int v2) { warning("TODO"); } -int TTNamedScript::proc8() const { +int TTNpcScript::proc8() const { return 0; } -int TTNamedScript::proc9() const { +int TTNpcScript::proc9() const { return 2; } -int TTNamedScript::proc10() const { +int TTNpcScript::proc10() const { return 2; } -int TTNamedScript::proc11() const { +int TTNpcScript::proc11() const { return 2; } -int TTNamedScript::proc12() const { +int TTNpcScript::proc12() const { return 1; } -bool TTNamedScript::proc13() const { +bool TTNpcScript::proc13() const { warning("TODO"); return true; } -void TTNamedScript::proc14(int v) { +void TTNpcScript::proc14(int v) { warning("TODO"); } -int TTNamedScript::proc15() const { +int TTNpcScript::proc15() const { return 0; } -bool TTNamedScript::proc16() const { +bool TTNpcScript::proc16() const { return true; } -bool TTNamedScript::proc17() const { +bool TTNpcScript::proc17() const { return true; } -bool TTNamedScript::proc18() const { +bool TTNpcScript::proc18() const { return true; } -void TTNamedScript::proc19(int v) { +void TTNpcScript::proc19(int v) { warning("TODO"); } -void TTNamedScript::proc20(int v) { +void TTNpcScript::proc20(int v) { warning("TODO"); } -int TTNamedScript::proc21(int v) { +int TTNpcScript::proc21(int v) { return v; } -int TTNamedScript::proc22() const { +int TTNpcScript::proc22() const { return 0; } -int TTNamedScript::proc23() const { +int TTNpcScript::proc23() const { return 0; } -int TTNamedScript::proc25() const { +int TTNpcScript::proc25() const { return 0; } -void TTNamedScript::proc26() { +void TTNpcScript::proc26() { } -void TTNamedScript::save(SimpleFile *file) { +void TTNpcScript::save(SimpleFile *file) { file->writeNumber(charId()); saveBody(file); @@ -158,7 +158,7 @@ void TTNamedScript::save(SimpleFile *file) { file->writeNumber(_array[idx]); } -void TTNamedScript::load(SimpleFile *file) { +void TTNpcScript::load(SimpleFile *file) { loadBody(file); int count = file->readNumber(); @@ -178,7 +178,7 @@ void TTNamedScript::load(SimpleFile *file) { } } -void TTNamedScript::saveBody(SimpleFile *file) { +void TTNpcScript::saveBody(SimpleFile *file) { int v = proc31(); file->writeNumber(v); @@ -187,7 +187,7 @@ void TTNamedScript::saveBody(SimpleFile *file) { } } -void TTNamedScript::loadBody(SimpleFile *file) { +void TTNpcScript::loadBody(SimpleFile *file) { int count = file->readNumber(); preLoad(); @@ -200,38 +200,38 @@ void TTNamedScript::loadBody(SimpleFile *file) { } } -int TTNamedScript::proc31() { +int TTNpcScript::proc31() { warning("TODO"); return 0; } -void TTNamedScript::proc32() { +void TTNpcScript::proc32() { warning("TODO"); } -void TTNamedScript::proc33(int v1, int v2) { +void TTNpcScript::proc33(int v1, int v2) { warning("TODO"); } -int TTNamedScript::proc34() { +int TTNpcScript::proc34() { warning("TODO"); return 0; } -int TTNamedScript::getDialLevel(uint dialNum, bool flag) { +int TTNpcScript::getDialLevel(uint dialNum, bool flag) { warning("TODO"); return 0; } -int TTNamedScript::proc36() const { +int TTNpcScript::proc36() const { return 0; } -int TTNamedScript::proc37() const { +int TTNpcScript::proc37() const { return 0; } -void TTNamedScript::preLoad() { +void TTNpcScript::preLoad() { if (_subPtr) { error("TODO"); } diff --git a/engines/titanic/true_talk/tt_named_script.h b/engines/titanic/true_talk/tt_npc_script.h index 8174f64c53..2f0370107e 100644 --- a/engines/titanic/true_talk/tt_named_script.h +++ b/engines/titanic/true_talk/tt_npc_script.h @@ -20,8 +20,8 @@ * */ -#ifndef TITANIC_TT_NAMED_SCRIPT_H -#define TITANIC_TT_NAMED_SCRIPT_H +#ifndef TITANIC_TT_NPC_SCRIPT_H +#define TITANIC_TT_NPC_SCRIPT_H #include "titanic/support/simple_file.h" #include "titanic/true_talk/tt_script_base.h" @@ -29,14 +29,14 @@ namespace Titanic { -class TTNamedScriptBase : public TTScriptBase { +class TTNpcScriptBase : public TTScriptBase { protected: int _field54; int _val2; public: int _charId; public: - TTNamedScriptBase(int charId, const char *charClass, int v2, + TTNpcScriptBase(int charId, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7); @@ -51,7 +51,7 @@ public: int charId() const { return _charId; } }; -class TTNamedScript : public TTNamedScriptBase { +class TTNpcScript : public TTNpcScriptBase { protected: byte *_subPtr; int _field60; @@ -69,7 +69,7 @@ protected: void randomizeFlags(); public: - TTNamedScript(int charId, const char *charClass, int v2, + TTNpcScript(int charId, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7); @@ -117,4 +117,4 @@ public: } // End of namespace Titanic -#endif /* TITANIC_TT_CHARACTER1_H */ +#endif /* TITANIC_TT_NPC_SCRIPT_H */ diff --git a/engines/titanic/true_talk/tt_scripts.cpp b/engines/titanic/true_talk/tt_scripts.cpp index 9bfa31af8b..bfcfabe059 100644 --- a/engines/titanic/true_talk/tt_scripts.cpp +++ b/engines/titanic/true_talk/tt_scripts.cpp @@ -33,11 +33,11 @@ namespace Titanic { -TTNamedScript *TTNamedScriptList::findById(int charId) const { - for (TTNamedScriptList::const_iterator i = begin(); i != end(); ++i) { - const TTNamedScriptListItem *item = *i; - if (item->_script->_charId == charId) - return item->_script; +TTNpcScript *TTNpcScriptList::findById(int charId) const { + for (TTNpcScriptList::const_iterator i = begin(); i != end(); ++i) { + const TTNpcScriptListItem *item = *i; + if (item->_npcScript->_charId == charId) + return item->_npcScript; } return nullptr; @@ -74,14 +74,14 @@ TTScripts::TTScripts(CTitleEngine *titleEngine) : addScript(new SuccUBusScript(111, "Succubus", 0, "Shorbert", 9, 1, -1, -1, -1, 0), 110); } -void TTScripts::addScript(TTNamedScript *script, int scriptId) { +void TTScripts::addScript(TTNpcScript *script, int scriptId) { script->proc13(); // Find the room script this is associated with TTRoomScript *roomScript = getRoomScript(scriptId); assert(roomScript); - _namedScripts.push_back(new TTNamedScriptListItem(script, roomScript)); + _namedScripts.push_back(new TTNpcScriptListItem(script, roomScript)); } void TTScripts::addScript(TTRoomScript *script) { @@ -92,7 +92,7 @@ TTRoomScript *TTScripts::getRoomScript(int scriptId) const { return _roomScripts.findById(scriptId); } -TTNamedScript *TTScripts::getNamedScript(int charId) const { +TTNpcScript *TTScripts::getNamedScript(int charId) const { return _namedScripts.findById(charId); } diff --git a/engines/titanic/true_talk/tt_scripts.h b/engines/titanic/true_talk/tt_scripts.h index 00638a03d5..7ee7263140 100644 --- a/engines/titanic/true_talk/tt_scripts.h +++ b/engines/titanic/true_talk/tt_scripts.h @@ -24,29 +24,29 @@ #define TITANIC_TT_SCRIPTS_H #include "titanic/core/list.h" -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/tt_room_script.h" namespace Titanic { class CTitleEngine; -class TTNamedScriptListItem : public ListItem { +class TTNpcScriptListItem : public ListItem { public: - TTNamedScript *_script; + TTNpcScript *_npcScript; TTRoomScript *_roomScript; public: - TTNamedScriptListItem() : _script(nullptr), _roomScript(nullptr) {} - TTNamedScriptListItem(TTNamedScript *script, TTRoomScript *roomScript) : - _script(script), _roomScript(roomScript) {} - virtual ~TTNamedScriptListItem() { delete _script; } + TTNpcScriptListItem() : _npcScript(nullptr), _roomScript(nullptr) {} + TTNpcScriptListItem(TTNpcScript *script, TTRoomScript *roomScript) : + _npcScript(script), _roomScript(roomScript) {} + virtual ~TTNpcScriptListItem() { delete _npcScript; } }; PTR_LIST_ITEM(TTRoomScript); -class TTNamedScriptList : public List<TTNamedScriptListItem> { +class TTNpcScriptList : public List<TTNpcScriptListItem> { public: - TTNamedScript *findById(int charId) const; + TTNpcScript *findById(int charId) const; }; class TTRoomScriptList : public List<TTRoomScriptListItem> { @@ -56,7 +56,7 @@ public: class TTScripts { private: - TTNamedScriptList _namedScripts; + TTNpcScriptList _namedScripts; TTRoomScriptList _roomScripts; CTitleEngine *_titleEngine; int _field24; @@ -65,7 +65,7 @@ private: /** * Add a named script to the named scripts list */ - void addScript(TTNamedScript *script, int charId); + void addScript(TTNpcScript *script, int charId); /** * Add an unnamed script to the unnamed scripts list @@ -82,7 +82,7 @@ public: /** * Return a pointer to the specified named character script */ - TTNamedScript *getNamedScript(int charId) const; + TTNpcScript *getNamedScript(int charId) const; }; } // End of namespace Titanic |