aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula/rooms.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2008-06-05 21:12:02 +0000
committerFilippos Karapetis2008-06-05 21:12:02 +0000
commit3c7e0f5f8dc39e27619f7d23d060264db8d906d3 (patch)
tree2deed0b278e4e95ed856a1f8a64c93001477a603 /engines/drascula/rooms.cpp
parentb7ac2f99f623b09c218884c490a8f3cb95eef77e (diff)
downloadscummvm-rg350-3c7e0f5f8dc39e27619f7d23d060264db8d906d3.tar.gz
scummvm-rg350-3c7e0f5f8dc39e27619f7d23d060264db8d906d3.tar.bz2
scummvm-rg350-3c7e0f5f8dc39e27619f7d23d060264db8d906d3.zip
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)
svn-id: r32562
Diffstat (limited to 'engines/drascula/rooms.cpp')
-rw-r--r--engines/drascula/rooms.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 968cf1952b..62d8c557fe 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -182,6 +182,9 @@ void DrasculaEngine::room_0() {
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 @@ void DrasculaEngine::room_55(int fl) {
}
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 @@ void DrasculaEngine::room_59(int fl) {
}
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) {