From 659d2bb234da395c6f0425ab04e66670d5ab1ca1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 4 Jun 2008 16:39:56 +0000
Subject: Fixed regression from commit #32536

svn-id: r32538
---
 engines/drascula/rooms.cpp    | 19 ++++++++++---------
 engines/drascula/staticdata.h |  5 -----
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'engines/drascula')

diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 2d4606564e..e318dccf27 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -226,15 +226,16 @@ void DrasculaEngine::room_7(int fl){
 }
 
 void DrasculaEngine::room_8(int fl) {
-	if (roomParse(room8Actions, ARRAYSIZE(room8Actions), fl))
-		return;
-
-	if (pickedObject == kVerbLook && fl == 147 && flags[7] == 0) {
-		talk(58);
-		pickObject(15);
-		flags[7] = 1;
-		if (flags[7] == 1 && flags[26] == 1 && flags[34] == 1 && flags[35] == 1 && flags[37] == 1)
-			flags[38] = 1;
+	if (pickedObject == kVerbLook && fl == 147) {
+		if (flags[7] == 0) {
+			talk(58);
+			pickObject(15);
+			flags[7] = 1;
+			if (flags[7] == 1 && flags[26] == 1 && flags[34] == 1 && flags[35] == 1 && flags[37] == 1)
+				flags[38] = 1;
+		} else {
+			talk(59);
+		}
 	} else
 		hasAnswer = 0;
 }
diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h
index 02f9360e6e..897fb15386 100644
--- a/engines/drascula/staticdata.h
+++ b/engines/drascula/staticdata.h
@@ -268,11 +268,6 @@ RoomTalkAction room7Actions[] = {
 	{ -1,	kVerbLook,		169,	 44 }
 };
 
-RoomTalkAction room8Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		147,	 59 }
-};
-
 RoomTalkAction room9Actions[] = {
 	// num	action			object	speech
 	{ -1,	kVerbLook,		150,	 35 },
-- 
cgit v1.2.3