Skip to content

Commit

Permalink
ScriptedConversation: Remove temporary variable
Browse files Browse the repository at this point in the history
  • Loading branch information
dscharrer committed Jan 15, 2018
1 parent ce14059 commit 301b04d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/script/ScriptedConversation.cpp
Expand Up @@ -327,7 +327,6 @@ class SpeakCommand : public Command {
CinematicSpeech acs;
acs.type = ARX_CINE_SPEECH_NONE;

Entity * io = context.getEntity();
Entity * speaker = context.getEntity();

bool unbreakable = false;
Expand Down Expand Up @@ -374,7 +373,7 @@ class SpeakCommand : public Command {
DebugScript(' ' << options << ' ' << data); // TODO debug more

if(data.empty()) {
ARX_SPEECH_ClearIOSpeech(io);
ARX_SPEECH_ClearIOSpeech(context.getEntity());
return Success;
}

Expand All @@ -393,7 +392,7 @@ class SpeakCommand : public Command {
if(onspeechend != size_t(-1)) {
aspeech[speechnum].scrpos = onspeechend;
aspeech[speechnum].es = context.getScript();
aspeech[speechnum].ioscript = io;
aspeech[speechnum].ioscript = context.getEntity();
if(unbreakable) {
aspeech[speechnum].flags |= ARX_SPEECH_FLAG_UNBREAKABLE;
}
Expand Down

0 comments on commit 301b04d

Please sign in to comment.