libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 02:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Renaming script methods

Browse Source
This commit is contained in:
Paul Gilbert 2016-06-01 20:39:31 -04:00
parent 58c8833d82
commit 01020dcd8c
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ int CScriptHandler::processInput(TTroomScript *roomScript, TTnpcScript *npcScrip
int canProcess = 0;
if (result) {
sentence->set34(result);
if (roomScript->proc6(npcScript, sentence, result)) {
if (roomScript->canRespond(npcScript, sentence, result)) {
canProcess = npcScript->chooseResponse(roomScript, sentence, result);
}
}

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

@ -70,7 +70,7 @@ public:
TTconcept *_nextP;
TTscriptBase *_scriptP;
TTword *_wordP;
ScriptType _scriptType;
int _scriptType;
int _field14;
int _field20;
int _field34;

4
engines/titanic/true_talk/tt_room_script.cpp
View File

@ -37,10 +37,6 @@ TTroomScript::TTroomScript(int scriptId) :
TTroomScriptBase(scriptId, "", "", 0, -1, -1, -1, 0, 0) {
}
void TTroomScript::proc7() {
warning("TODO");
}
void TTroomScript::proc8() {
warning("TODO");
}

28
engines/titanic/true_talk/tt_room_script.h
View File

@ -37,8 +37,16 @@ public:
TTroomScriptBase(int scriptId, const char *charClass, const char *charName,
int v3, int v4, int v5, int v6, int v2, int v7);
virtual int proc6(TTnpcScript *npcScript, TTsentence *sentence, int val) = 0;
virtual void proc7() = 0;
/**
* Returns true if a response can be made
*/
virtual bool canRespond(TTnpcScript *npcScript, TTsentence *sentence, int val) const = 0;
/**
* Returns true if further sentence processing is allowed
*/
virtual bool canProcess(TTnpcScript *npcScript, TTsentence *sentence) const = 0;
virtual void proc8() = 0;
virtual void proc9() = 0;
@ -57,8 +65,20 @@ public:
public:
TTroomScript(int scriptId);
virtual int proc6(TTnpcScript *npcScript, TTsentence *sentence, int val) { return 1; }
virtual void proc7();
/**
* Returns true if a response can be made
*/
virtual bool canRespond(TTnpcScript *npcScript, TTsentence *sentence, int val) const {
return true;
}
/**
* Returns true if further sentence processing is allowed
*/
virtual bool canProcess(TTnpcScript *npcScript, TTsentence *sentence) const {
return true;
}
virtual void proc8();
virtual void proc9();