From 3b1e4fc15fa18cff7ec557485d8738c828325ff6 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 6 Jun 2008 19:29:59 +0000
Subject: Move more room code into roomActions[].

svn-id: r32582
---
 engines/drascula/rooms.cpp    | 8 ++------
 engines/drascula/staticdata.h | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/drascula')

diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 08d4e8ab4c..7c2930e642 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -683,9 +683,7 @@ bool DrasculaEngine::room_27(int fl) {
 		flags[23] = 1;
 		openDoor(5,3);
 		withoutVerb();
-	} else if (pickedObject == kVerbLook && fl == 175)
-		talk(429);
-	else if (fl == 150)
+	} else if (fl == 150)
 		talk(460);
 	else
 		hasAnswer = 0;
@@ -831,7 +829,7 @@ bool DrasculaEngine::room_53(int fl) {
 bool DrasculaEngine::room_54(int fl) {
 	if ((pickedObject == kVerbTalk && fl == 118) || (pickedObject == kVerbLook && fl == 118 && flags[0] == 0))
 		animation_1_5();
-	else if (pickedObject == kVerbLook && fl == 118 && flags[0]==1)
+	else if (pickedObject == kVerbLook && fl == 118 && flags[0] == 1)
 		talk(124);
 	else if (pickedObject == kVerbTalk && fl == 53 && flags[14] == 0) {
 		talk(288);
@@ -1008,8 +1006,6 @@ bool DrasculaEngine::room_102(int fl) {
 		pickObject(20);
 	else if (pickedObject == 20 && fl == 100)
 		animation_6_6();
-	else if (pickedObject == kVerbPick || pickedObject == kVerbOpen)
-		talk(453);
 	else
 		hasAnswer = 0;
 
diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h
index 8a5890bd7a..c9350f251c 100644
--- a/engines/drascula/staticdata.h
+++ b/engines/drascula/staticdata.h
@@ -412,6 +412,8 @@ RoomTalkAction roomActions[] = {
 	{ 26,	-1,	kVerbLook,		168,	476 },
 	{ 26,	-1,	kVerbPick,		168,	477 },
 	// ==================================
+	{ 27,	-1,	kVerbLook,		175,	429 },
+	// ==================================
 	{ 29,	-1,	kVerbLook,		152,	463 },
 	{ 29,	-1,	kVerbOpen,		152,	464 },
 	// ----------------------------------
@@ -507,6 +509,8 @@ RoomTalkAction roomActions[] = {
 	// ==================================
 	{ 102,	-1,	kVerbLook,		100,	452 },
 	{ 102,	-1,	kVerbLook,		101,	123 },
+	{ 102,	-1,	kVerbPick,		-1,		453 },
+	{ 102,	-1,	kVerbOpen,		-1,		453 },
 	// ==================================
 	// Pseudoroom. checkAction() menuScreen == 1
 	{ 200,	1,	kVerbLook,		28,		328 },
-- 
cgit v1.2.3