aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v5.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-20 16:13:34 +0000
committerMax Horn2003-05-20 16:13:34 +0000
commit3e3d6f1360332d9bed9fc28a1930b1d033f58138 (patch)
tree3b47d88a2b63c6ceb723a0208a1651cf3225c1af /scumm/script_v5.cpp
parent93d29f2f9aa3c951aab75a0ce71af714aebbc54e (diff)
downloadscummvm-rg350-3e3d6f1360332d9bed9fc28a1930b1d033f58138.tar.gz
scummvm-rg350-3e3d6f1360332d9bed9fc28a1930b1d033f58138.tar.bz2
scummvm-rg350-3e3d6f1360332d9bed9fc28a1930b1d033f58138.zip
renamed o2_matrixOps -> o2_setBoxFlags; V2 'objY' fixes; cleanup
svn-id: r7739
Diffstat (limited to 'scumm/script_v5.cpp')
-rw-r--r--scumm/script_v5.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index cd8e8a1bff..3151a7c4d4 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -732,7 +732,7 @@ void Scumm_v5::o5_divide() {
}
void Scumm_v5::o5_doSentence() {
- int a, b;
+ int a;
SentenceTab *st;
a = getVarOrDirectByte(0x80);
@@ -747,12 +747,8 @@ void Scumm_v5::o5_doSentence() {
st->verb = a;
st->objectA = getVarOrDirectWord(0x40);
- b = st->objectB = getVarOrDirectWord(0x20);
- if (b == 0) {
- st->unk2 = 0;
- } else {
- st->unk2 = 1;
- }
+ st->objectB = getVarOrDirectWord(0x20);
+ st->unk2 = (st->objectB != 0);
st->freezeCount = 0;
}