From 386b8216dff090609d79f7adbddc727132c60d04 Mon Sep 17 00:00:00 2001
From: James Brown
Date: Tue, 5 Aug 2003 16:57:47 +0000
Subject: Make prepositions work

svn-id: r9505
---
 scumm/script_v2.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'scumm')

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;
 		}
 	}
 
-- 
cgit v1.2.3