Work on V2 inventory hack a little more

svn-id: r7776

1 files changed, 11 insertions, 7 deletions

diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 38fbc860c5..043871cbb9 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -875,21 +875,25 @@ void Scumm_v2::o2_doSentence() {
 void Scumm_v2::o2_drawSentence() {
 	ScummVM::Rect sentenceline;
 	static char sentence[80];
+	byte *temp;
 	int slot = getVerbSlot(_scummVars[VAR_SENTENCE_VERB],0);
 
 	if (!(_userState & 32))
 		return;
 
 	strcpy(sentence, (char*)getResourceAddress(rtVerb, slot));
-
-	if (_scummVars[27] > 0) {
-		strcat(sentence, " ");
-		strcat(sentence, (char*)getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1]));
+	if (_scummVars[VAR_SENTENCE_OBJECT1] > 0) {
+		if (temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1])) {
+			strcat(sentence, " ");
+			strcat(sentence, (char*)temp);
+		}
 	}
 
-	if (_scummVars[28] > 0) {
-		strcat(sentence, " ");
-		strcat(sentence, (char*)getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2]));
+	if (_scummVars[VAR_SENTENCE_OBJECT2] > 0) {
+		if (temp = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2])) {
+			strcat(sentence, " with ");
+			strcat(sentence, (char*)temp);
+		}
 	}
 
 	_string[2].charset = 1;