diff options
| author | Torbjörn Andersson | 2003-12-14 16:33:27 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-12-14 16:33:27 +0000 |
| commit | 4420b15d9f59227cc57bb60d5b38c73639437a62 (patch) | |
| tree | 0516b8935d48adc82ea6d758e154af1b75fcbc44 /sword2/speech.cpp | |
| parent | ce04dd9f7e77fe1c31eb14aebde2f69c16d33684 (diff) | |
| download | scummvm-rg350-4420b15d9f59227cc57bb60d5b38c73639437a62.tar.gz scummvm-rg350-4420b15d9f59227cc57bb60d5b38c73639437a62.tar.bz2 scummvm-rg350-4420b15d9f59227cc57bb60d5b38c73639437a62.zip | |
Mostly cleanups, but I believe this also fixes an endian problem in the
"restart script" opcode. To actually verify this, though, I'd need to find
a case where any other script than script 0 at offset 0 is restarted...
svn-id: r11638
Diffstat (limited to 'sword2/speech.cpp')
| -rw-r--r-- | sword2/speech.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 3ae4b9bbe9..5422dd7c21 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -126,7 +126,7 @@ int32 Logic::fnChoose(int32 *params) { OBJECT_HELD = 0; // clear it so it doesn't keep happening! IN_SUBJECT = 0; // clear the subject list - return IR_CONT + (response << 3); + return IR_CONT | (response << 3); } // new thing for skipping chooser with "nothing else to say" text @@ -140,7 +140,7 @@ int32 Logic::fnChoose(int32 *params) { // return special subject chosen code (same as in normal // chooser routine below) - return IR_CONT + (_subjectList[0].ref << 3); + return IR_CONT | (_subjectList[0].ref << 3); } if (!_choosing) { @@ -232,7 +232,7 @@ int32 Logic::fnChoose(int32 *params) { RESULT = _subjectList[hit].res; // return special subject chosen code - return IR_CONT + (_subjectList[hit].ref << 3); + return IR_CONT | (_subjectList[hit].ref << 3); } int32 Logic::fnStartConversation(int32 *params) { |