aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2008-06-06 07:48:00 +0000
committerFilippos Karapetis2008-06-06 07:48:00 +0000
commit547e25667b441f29ed96af7546b68ad468f89a40 (patch)
tree1dd4dccf9151bbe0ecf4cba316378a091627ab21 /engines
parentbc76980ae6c85ff74ed781240a782bd8cd86af76 (diff)
downloadscummvm-rg350-547e25667b441f29ed96af7546b68ad468f89a40.tar.gz
scummvm-rg350-547e25667b441f29ed96af7546b68ad468f89a40.tar.bz2
scummvm-rg350-547e25667b441f29ed96af7546b68ad468f89a40.zip
Removed the empty specialized parsers for rooms 19, 44, 61 and 63
svn-id: r32571
Diffstat (limited to 'engines')
-rw-r--r--engines/drascula/drascula.h6
-rw-r--r--engines/drascula/rooms.cpp28
2 files changed, 1 insertions, 33 deletions
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 858b838f94..b044086fd5 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -503,13 +503,12 @@ public:
bool room_8(int);
bool room_9(int);
bool room_12(int);
- bool room_13(int fl);
+ bool room_13(int);
bool room_14(int);
bool room_15(int);
bool room_16(int);
bool room_17(int);
bool room_18(int);
- bool room_19(int);
bool room_21(int);
bool room_22(int);
bool room_23(int);
@@ -521,7 +520,6 @@ public:
bool room_31(int);
bool room_34(int);
bool room_35(int);
- bool room_44(int);
bool room_49(int);
bool room_53(int);
bool room_54(int);
@@ -530,9 +528,7 @@ public:
bool room_58(int);
bool room_59(int);
bool room_60(int);
- bool room_61(int);
bool room_62(int);
- bool room_63(int);
bool room_102(int);
void animation_1_1();
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 096d912b93..48ba7a0964 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -71,7 +71,6 @@ void DrasculaEngine::setupRoomsTable() {
ROOM(room_16);
ROOM(room_17);
ROOM(room_18);
- ROOM(room_19);
ROOM(room_21); // returns bool
ROOM(room_22);
ROOM(room_23);
@@ -83,7 +82,6 @@ void DrasculaEngine::setupRoomsTable() {
ROOM(room_31);
ROOM(room_34);
ROOM(room_35);
- ROOM(room_44);
ROOM(room_49);
ROOM(room_53);
ROOM(room_54);
@@ -92,9 +90,7 @@ void DrasculaEngine::setupRoomsTable() {
ROOM(room_58);
ROOM(room_59);
ROOM(room_60); // returns bool
- ROOM(room_61);
ROOM(room_62);
- ROOM(room_63);
ROOM(room_102);
PREUPDATEROOM(update_1_pre);
@@ -571,12 +567,6 @@ bool DrasculaEngine::room_18(int fl) {
return true;
}
-bool DrasculaEngine::room_19(int fl) {
- hasAnswer = 0;
-
- return true;
-}
-
bool DrasculaEngine::room_21(int fl) {
if (pickedObject == kVerbOpen && fl == 101 && flags[28] == 0)
talk(419);
@@ -834,12 +824,6 @@ bool DrasculaEngine::room_35(int fl) {
return true;
}
-bool DrasculaEngine::room_44(int fl) {
- hasAnswer = 0;
-
- return true;
-}
-
bool DrasculaEngine::room_49(int fl) {
if (pickedObject == kVerbTalk && fl ==51)
converse(9);
@@ -1035,12 +1019,6 @@ bool DrasculaEngine::room_60(int fl) {
return false;
}
-bool DrasculaEngine::room_61(int fl) {
- hasAnswer = 0;
-
- return true;
-}
-
bool DrasculaEngine::room_62(int fl) {
if (pickedObject == kVerbTalk && fl == 53)
converse(13);
@@ -1056,12 +1034,6 @@ bool DrasculaEngine::room_62(int fl) {
return true;
}
-bool DrasculaEngine::room_63(int fl) {
- hasAnswer = 0;
-
- return true;
-}
-
bool DrasculaEngine::room_102(int fl) {
if (pickedObject == kVerbPick && fl == 101)
pickObject(20);