libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 17:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Remove deprecated NPC methods for data now loaded from DAT file

Browse Source
This commit is contained in:
Paul Gilbert 2016-06-11 21:21:12 -04:00
parent 314a8f25ab
commit a5e6d1e345
19 changed files with 0 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/titanic/true_talk/barbot_script.cpp
View File

@ -214,11 +214,6 @@ bool BarbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return false;
}
bool BarbotScript::proc18() const {
warning("TODO");
return false;
}
int BarbotScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

1
engines/titanic/true_talk/barbot_script.h
View File

@ -67,7 +67,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc22(int id) const;
virtual int proc23() const;

5
engines/titanic/true_talk/bellbot_script.cpp
View File

@ -74,11 +74,6 @@ bool BellbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return false;
}
bool BellbotScript::proc18() const {
warning("TODO");
return 0;
}
int BellbotScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

1
engines/titanic/true_talk/bellbot_script.h
View File

@ -58,7 +58,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc22(int id) const;
virtual int proc23() const;

5
engines/titanic/true_talk/deskbot_script.cpp
View File

@ -75,11 +75,6 @@ bool DeskbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return 0;
}
bool DeskbotScript::proc18() const {
warning("TODO");
return 0;
}
int DeskbotScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

1
engines/titanic/true_talk/deskbot_script.h
View File

@ -53,7 +53,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc22(int id) const;
virtual int proc23() const;

5
engines/titanic/true_talk/doorbot_script.cpp
View File

@ -129,11 +129,6 @@ bool DoorbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return 0;
}
bool DoorbotScript::proc18() const {
warning("TODO");
return 0;
}
int DoorbotScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

1
engines/titanic/true_talk/doorbot_script.h
View File

@ -64,7 +64,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc22(int id) const;
virtual int proc23() const;

5
engines/titanic/true_talk/liftbot_script.cpp
View File

@ -106,11 +106,6 @@ bool LiftbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return 0;
}
bool LiftbotScript::proc18() const {
warning("TODO");
return 0;
}
int LiftbotScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

1
engines/titanic/true_talk/liftbot_script.h
View File

@ -61,7 +61,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc22(int id) const;
virtual int proc23() const;

5
engines/titanic/true_talk/maitred_script.cpp
View File

@ -79,11 +79,6 @@ bool MaitreDScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return 0;
}
bool MaitreDScript::proc18() const {
warning("TODO");
return 0;
}
int MaitreDScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

1
engines/titanic/true_talk/maitred_script.h
View File

@ -55,7 +55,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc22(int id) const;
virtual int proc23() const;

5
engines/titanic/true_talk/parrot_script.cpp
View File

@ -103,11 +103,6 @@ ScriptChangedResult ParrotScript::scriptChanged(TTscriptBase *roomScript, uint i
return (id == 3) ? SCR_2 : SCR_1;
}
bool ParrotScript::proc18() const {
warning("TODO");
return 0;
}
int ParrotScript::proc23() const {
warning("TODO");
return 0;

1
engines/titanic/true_talk/parrot_script.h
View File

@ -52,7 +52,6 @@ public:
*/
virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id);
virtual bool proc18() const;
virtual int proc23() const;
virtual const int *getTablePtr(int id);
virtual int proc25(int val1, int val2, TTroomScript *roomScript, TTsentence *sentence) const;

5
engines/titanic/true_talk/succubus_script.cpp
View File

@ -84,11 +84,6 @@ ScriptChangedResult SuccUBusScript::scriptChanged(TTscriptBase *roomScript, uint
return SCR_1;
}
bool SuccUBusScript::proc18() const {
warning("TODO");
return 0;
}
int SuccUBusScript::proc21(int v1, int v2, int v3) {
warning("TODO");
return 0;

2
engines/titanic/true_talk/succubus_script.h
View File

@ -54,8 +54,6 @@ public:
*/
virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id);
virtual bool proc18() const;
virtual int proc21(int v1, int v2, int v3);
virtual int proc23() const;
virtual const int *getTablePtr(int id);

20
engines/titanic/true_talk/tt_npc_script.cpp
View File

@ -267,18 +267,6 @@ int TTnpcScript::proc12() const {
return 1;
}
bool TTnpcScript::loadQuotes() {
// Original did a load of a global quotes here the first time
// this method is called. ScummVM implementation has refactored
// the loading to the CTrueTalkManager constructor
if (!proc18()) {
return false;
} else {
return proc17();
}
}
void TTnpcScript::selectResponse(int id) {
if (id >= 200000 && id <= 290264)
id = getDialogueId(id);
@ -295,14 +283,6 @@ bool TTnpcScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence,
return true;
}
bool TTnpcScript::proc17() const {
return true;
}
bool TTnpcScript::proc18() const {
return true;
}
uint TTnpcScript::getRangeValue(uint id) {
TTscriptRange *range = findRange(id);
if (!range)

8
engines/titanic/true_talk/tt_npc_script.h
View File

@ -283,11 +283,6 @@ public:
virtual int proc11() const;
virtual int proc12() const;
/**
* Handles loading quotes used by the scripts
*/
virtual bool loadQuotes();
/**
* Translate a passed Id to a dialogue Id if necessary,
* and adds it to the response
@ -299,9 +294,6 @@ public:
virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence,
int val, uint tagId, uint remainder) const;
virtual bool proc17() const;
virtual bool proc18() const;
/**
* Given an Id for a previously registered set of random number values,
* picks one of the array values and returns it.. depending on flags,

2
engines/titanic/true_talk/tt_scripts.cpp
View File

@ -75,8 +75,6 @@ TTscripts::TTscripts(CTitleEngine *titleEngine) :
}
void TTscripts::addScript(TTnpcScript *script, int scriptId) {
script->loadQuotes();
// Find the room script this is associated with
TTroomScript *roomScript = getRoomScript(scriptId);
assert(roomScript);