aboutsummaryrefslogtreecommitdiff
path: root/engines/mutationofjb/commands
diff options
context:
space:
mode:
authorĽubomír Remák2018-03-08 23:05:44 +0100
committerEugene Sandulenko2018-08-25 23:12:01 +0200
commitb4dad9bca7593029ab368bc99f7bd96c71cbf4d8 (patch)
tree108ff4ccbf9c7577c637184153cdf702f4dbbdb9 /engines/mutationofjb/commands
parentdae522f63c05029298da1694038af9b24655ac05 (diff)
downloadscummvm-rg350-b4dad9bca7593029ab368bc99f7bd96c71cbf4d8.tar.gz
scummvm-rg350-b4dad9bca7593029ab368bc99f7bd96c71cbf4d8.tar.bz2
scummvm-rg350-b4dad9bca7593029ab368bc99f7bd96c71cbf4d8.zip
MUTATIONOFJB: Show multiple script commands in showsection debug command.
Diffstat (limited to 'engines/mutationofjb/commands')
-rw-r--r--engines/mutationofjb/commands/saycommand.cpp6
-rw-r--r--engines/mutationofjb/commands/saycommand.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/mutationofjb/commands/saycommand.cpp b/engines/mutationofjb/commands/saycommand.cpp
index 9448203911..a0c9c79bd6 100644
--- a/engines/mutationofjb/commands/saycommand.cpp
+++ b/engines/mutationofjb/commands/saycommand.cpp
@@ -93,7 +93,9 @@ bool SayCommandParser::parse(const Common::String &line, ScriptParseContext &par
break;
}
}
- startPos++;
+ if (startPos != currentLine.size()) {
+ startPos++;
+ }
uint endPos;
for (endPos = startPos; endPos < currentLine.size(); ++endPos) {
@@ -120,7 +122,7 @@ bool SayCommandParser::parse(const Common::String &line, ScriptParseContext &par
if (lineToSay.empty()) {
lineToSay = talkStr;
} else {
- lineToSay = " " + talkStr;
+ lineToSay += " " + talkStr;
}
if (cont) {
diff --git a/engines/mutationofjb/commands/saycommand.h b/engines/mutationofjb/commands/saycommand.h
index 16303de467..e2a1207afc 100644
--- a/engines/mutationofjb/commands/saycommand.h
+++ b/engines/mutationofjb/commands/saycommand.h
@@ -37,7 +37,7 @@ public:
class SayCommand : public SeqCommand {
public:
- SayCommand(Common::String &lineToSay, Common::String &voiceFile, bool waitForPrevious, bool talkingAnimation) :
+ SayCommand(const Common::String &lineToSay, const Common::String &voiceFile, bool waitForPrevious, bool talkingAnimation) :
_lineToSay(lineToSay),
_voiceFile(voiceFile),
_waitForPrevious(waitForPrevious),