[Scummvm-cvs-logs] SF.net SVN: scummvm: [32562] scummvm/trunk/engines/drascula/rooms.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Jun 5 23:12:11 CEST 2008
Revision: 32562
http://scummvm.svn.sourceforge.net/scummvm/?rev=32562&view=rev
Author: thebluegr
Date: 2008-06-05 14:12:02 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
Fixed regression: rooms 0, 56 and 60 are not called by the default room parser (13 and 21 too, but there are no default actions associated with them)
Modified Paths:
--------------
scummvm/trunk/engines/drascula/rooms.cpp
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-06-05 20:35:45 UTC (rev 32561)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-06-05 21:12:02 UTC (rev 32562)
@@ -182,6 +182,9 @@
static const int lookExcuses[3] = {100, 101, 54};
static const int actionExcuses[6] = {11, 109, 111, 110, 115, 116};
+ if (roomParse(0, -1))
+ return;
+
// non-default actions
if (currentChapter == 2 || currentChapter == 4 ||
currentChapter == 5 || currentChapter == 6) {
@@ -861,6 +864,9 @@
}
bool DrasculaEngine::room_56(int fl) {
+ if (roomParse(56, fl))
+ return false;
+
if (pickedObject == kVerbOpen && fl == 124) {
animation_14_5();
return true;
@@ -944,6 +950,9 @@
}
bool DrasculaEngine::room_60(int fl) {
+ if (roomParse(60, fl))
+ return false;
+
if (pickedObject == kVerbMove && fl == 112)
animation_10_6();
else if (pickedObject == kVerbTalk && fl == 52) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list