diff options
Diffstat (limited to 'engines/mutationofjb/commands')
| -rw-r--r-- | engines/mutationofjb/commands/definestructcommand.cpp | 2 | ||||
| -rw-r--r-- | engines/mutationofjb/commands/talkcommand.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/mutationofjb/commands/definestructcommand.cpp b/engines/mutationofjb/commands/definestructcommand.cpp index ee15274a2d..93dbfc80bc 100644 --- a/engines/mutationofjb/commands/definestructcommand.cpp +++ b/engines/mutationofjb/commands/definestructcommand.cpp @@ -56,7 +56,7 @@ bool DefineStructCommandParser::parse(const Common::String &line, ScriptParseCon for (int j = 0; j < 5; ++j) { ConversationInfo::Item convItem; - convItem._question = atoi(linePtr); + convItem._choice = atoi(linePtr); linePtr += 6; convItem._response = atoi(linePtr); linePtr += 6; diff --git a/engines/mutationofjb/commands/talkcommand.cpp b/engines/mutationofjb/commands/talkcommand.cpp index d0775e481f..18ce956696 100644 --- a/engines/mutationofjb/commands/talkcommand.cpp +++ b/engines/mutationofjb/commands/talkcommand.cpp @@ -21,9 +21,12 @@ */ #include "mutationofjb/commands/talkcommand.h" -#include "mutationofjb/tasks/conversationtask.h" -#include "mutationofjb/script.h" + #include "mutationofjb/game.h" +#include "mutationofjb/script.h" +#include "mutationofjb/tasks/conversationtask.h" +#include "mutationofjb/tasks/taskmanager.h" + #include "common/str.h" namespace MutationOfJB { @@ -53,7 +56,7 @@ bool TalkCommandParser::parse(const Common::String &line, ScriptParseContext &, Command::ExecuteResult TalkCommand::execute(ScriptExecutionContext &scriptExeCtx) { if (!_task) { - _task = new ConversationTask(scriptExeCtx.getGame().getGameData()._conversationInfo); + _task = new ConversationTask(scriptExeCtx.getGameData()._currentScene, scriptExeCtx.getGame().getGameData()._conversationInfo); scriptExeCtx.getGame().getTaskManager().addTask(_task); } |