aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/script_v2.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index aafb347e1a..d3ff6aba1c 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -952,14 +952,13 @@ void Scumm_v2::o2_drawSentence() {
if ((_version == 1) && (VAR(VAR_SENTENCE_PREPOSITION) == 0)) {
byte *ptr = getOBCDFromObject(VAR(VAR_SENTENCE_OBJECT1)) + 12;
+ int prep = (*ptr >> 5);
VerbSlot *vs = &_verbs[slot];
- if (ptr) {
- if (vs->prep == 0)
- VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
- else
- VAR(VAR_SENTENCE_PREPOSITION) = vs->prep;
- }
+ if (vs->prep == 0xFF)
+ VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
+ else
+ VAR(VAR_SENTENCE_PREPOSITION) = vs->prep;
}
}