aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorJames Brown2003-08-05 16:48:56 +0000
committerJames Brown2003-08-05 16:48:56 +0000
commit7cbb06c4a60aeb1bbfe0b593b13c3228160da71b (patch)
tree19c6716b3b8ca41b9fa4137ce91274045ffb3735 /scumm
parent173e3c5db36eb2ae56dd31ec49b2fac955920816 (diff)
downloadscummvm-rg350-7cbb06c4a60aeb1bbfe0b593b13c3228160da71b.tar.gz
scummvm-rg350-7cbb06c4a60aeb1bbfe0b593b13c3228160da71b.tar.bz2
scummvm-rg350-7cbb06c4a60aeb1bbfe0b593b13c3228160da71b.zip
Forgot some V1 prep code
svn-id: r9503
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v2.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 624cd2c30a..df3d359276 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -954,8 +954,12 @@ void Scumm_v2::o2_drawSentence() {
byte *ptr = getOBCDFromObject(VAR(VAR_SENTENCE_OBJECT1)) + 12;
VerbSlot *vs = &_verbs[slot];
- if (ptr && (vs->prep == 0xFF))
- VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
+ if (ptr) {
+ if (vs->prep == 0)
+ VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
+ else
+ VAR(VAR_SENTENCE_PREPOSITION) = vs->prep;
+ }
}
}