[Scummvm-cvs-logs] SF.net SVN: scummvm: [32538] scummvm/trunk/engines/drascula

[thebluegr at users.sourceforge.net]

Revision: 32538
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32538&view=rev
Author:   thebluegr
Date:     2008-06-04 09:39:56 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Fixed regression from commit #32536

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/rooms.cpp
    scummvm/trunk/engines/drascula/staticdata.h

Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp	2008-06-04 16:15:08 UTC (rev 32537)
+++ scummvm/trunk/engines/drascula/rooms.cpp	2008-06-04 16:39:56 UTC (rev 32538)
@@ -226,15 +226,16 @@
 }
 
 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;
 }

Modified: scummvm/trunk/engines/drascula/staticdata.h
===================================================================
--- scummvm/trunk/engines/drascula/staticdata.h	2008-06-04 16:15:08 UTC (rev 32537)
+++ scummvm/trunk/engines/drascula/staticdata.h	2008-06-04 16:39:56 UTC (rev 32538)
@@ -268,11 +268,6 @@
 	{ -1,	kVerbLook,		169,	 44 }
 };
 
-RoomTalkAction room8Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		147,	 59 }
-};
-
 RoomTalkAction room9Actions[] = {
 	// num	action			object	speech
 	{ -1,	kVerbLook,		150,	 35 },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.