aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/startrek.h
diff options
context:
space:
mode:
authorMatthew Stewart2018-05-19 21:59:11 -0400
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commit66b4ec36bdfb19a5242325e58c3180bc79574c89 (patch)
treeec72997bbb14cbf1eca06ae5b9ecd7a41795ddad /engines/startrek/startrek.h
parenta6bee58f62f3d7d696c6b5493f248390d5c303ac (diff)
downloadscummvm-rg350-66b4ec36bdfb19a5242325e58c3180bc79574c89.tar.gz
scummvm-rg350-66b4ec36bdfb19a5242325e58c3180bc79574c89.tar.bz2
scummvm-rg350-66b4ec36bdfb19a5242325e58c3180bc79574c89.zip
STARTREK: Cleanup some text code
Diffstat (limited to 'engines/startrek/startrek.h')
-rw-r--r--engines/startrek/startrek.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h
index 9689c04ef8..5301f4d7c1 100644
--- a/engines/startrek/startrek.h
+++ b/engines/startrek/startrek.h
@@ -317,12 +317,12 @@ public:
String readTextFromRdf(int choiceIndex, uintptr data, String *headerTextOutput);
String readTextFromBuffer(int choiceIndex, uintptr data, String *headerTextOutput);
- int showTextbox(String headerText, const String &mainText, int xoffset, int yoffset, byte textColor, int maxTextLines); // TODO: better name. (return type?)
+ void showTextbox(String headerText, const String &mainText, int xoffset, int yoffset, byte textColor, int maxTextLines); // TODO: better name. (return type?)
String skipTextAudioPrompt(const String &str);
String playTextAudio(const String &str);
- int showText(TextGetterFunc textGetter, uintptr var, int xoffset, int yoffset, int textColor, bool loopChoices, int maxTextLines, int arg10);
+ int showText(TextGetterFunc textGetter, uintptr var, int xoffset, int yoffset, int textColor, bool loopChoices, int maxTextLines, bool rclickCancelsChoice);
int getNumTextboxLines(const String &str);
String putTextIntoLines(const String &text);
@@ -403,7 +403,7 @@ public:
int32 _playerActorScale;
Common::String _txtFilename;
- Common::String _itemDescription;
+ Common::String _loadedText; // TODO: might be OK to delete this
// Queue of "commands" (ie. next frame, clicked on object) for away mission or bridge
Common::Queue<Command> _commandQueue;