diff options
| author | James Brown | 2003-08-05 16:57:47 +0000 |
|---|---|---|
| committer | James Brown | 2003-08-05 16:57:47 +0000 |
| commit | 386b8216dff090609d79f7adbddc727132c60d04 (patch) | |
| tree | cdd25b34ce94e9ec245a14b4bac32dafbce68f09 /scumm | |
| parent | 10508d4d2bfeff8baa9615596521a1c1a2c44d07 (diff) | |
| download | scummvm-rg350-386b8216dff090609d79f7adbddc727132c60d04.tar.gz scummvm-rg350-386b8216dff090609d79f7adbddc727132c60d04.tar.bz2 scummvm-rg350-386b8216dff090609d79f7adbddc727132c60d04.zip | |
Make prepositions work
svn-id: r9505
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v2.cpp | 11 |
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; } } |