aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/true_talk/script_handler.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-28 16:14:45 -0500
committerPaul Gilbert2017-01-28 16:14:45 -0500
commit4b1762d649364abd2c59056fcfb4840df02ee7be (patch)
tree4a70e97f6170dee6cfe4bcb0f8593a706d74e5d2 /engines/titanic/true_talk/script_handler.h
parent4353fd8b662253323b038817f1aa4f36bdd1b82e (diff)
downloadscummvm-rg350-4b1762d649364abd2c59056fcfb4840df02ee7be.tar.gz
scummvm-rg350-4b1762d649364abd2c59056fcfb4840df02ee7be.tar.bz2
scummvm-rg350-4b1762d649364abd2c59056fcfb4840df02ee7be.zip
TITANIC: Revert field renamings in CScriptHandler
I initially thought the four concept fields could be given a relevant name for actor, object, and verb, but on further analysis, it looks like what fields go in which concept slot depends on the kind of sentence. I haven't been able to find any consistency, so I'm reverting them back to being called _concept1P through _concept4P
Diffstat (limited to 'engines/titanic/true_talk/script_handler.h')
-rw-r--r--engines/titanic/true_talk/script_handler.h28
1 files changed, 7 insertions, 21 deletions
diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index 73419fc73e..b8e62a586c 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -39,23 +39,16 @@ private:
CTitleEngine *_owner;
int _inputCtr;
private:
- /**
- * Sets the text for the actor concept
- */
- void setActor(const TTstring *str);
-
- /**
- * Sets the text for the onject concept
- */
- void setObject(const TTstring *str);
+ void handleWord1(const TTstring *str);
+ void handleWord2(const TTstring *str);
public:
TTparser _parser;
TTvocab *_vocab;
TTscriptBase *_script;
- TTconcept *_conceptObject;
- TTconcept *_conceptActor;
- TTconcept *_conceptUnused;
- TTconcept *_conceptVerb;
+ TTconcept *_concept1P;
+ TTconcept *_concept2P;
+ TTconcept *_concept3P;
+ TTconcept *_concept4P;
public:
CScriptHandler(CTitleEngine *owner, int val1, int val2);
~CScriptHandler();
@@ -66,10 +59,6 @@ public:
ScriptChangedResult scriptChanged(TTroomScript *roomScript,
TTnpcScript *npcScript, uint dialogueId);
- /**
- * Main processing and handling for text lines entered into the
- * Conversation tab of the PET
- */
int processInput(TTroomScript *roomScript, TTnpcScript *npcScript,
const TTstring &line);
@@ -88,10 +77,7 @@ public:
*/
int setResponse(TTscriptBase *script, TTresponse *response);
- /**
- * Sets the concepts for both actor and object to the specified text
- */
- void setActorObject(const TTstring *str);
+ void handleWord(const TTstring *str);
};
} // End of namespace Titanic