aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2008-06-05 19:04:58 +0000
committerEugene Sandulenko2008-06-05 19:04:58 +0000
commita921549370b89f9cdddb16b5727efe416015663f (patch)
treebbde774c1ae9dcfeba811c2b703ce9a1f1cb9d2d
parentb9516aa80e21c4fd61cab13bba7b6170ffc1a523 (diff)
downloadscummvm-rg350-a921549370b89f9cdddb16b5727efe416015663f.tar.gz
scummvm-rg350-a921549370b89f9cdddb16b5727efe416015663f.tar.bz2
scummvm-rg350-a921549370b89f9cdddb16b5727efe416015663f.zip
Pendulum room is room #102
svn-id: r32558
-rw-r--r--engines/drascula/drascula.h4
-rw-r--r--engines/drascula/rooms.cpp12
-rw-r--r--engines/drascula/staticdata.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 76b3c5c966..f93d788fd8 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -477,8 +477,6 @@ public:
void converse(int);
void print_abc_opc(const char *, int, int, int);
void response(int);
- void room_pendulum(int);
- void update_pendulum();
void activatePendulum();
void MusicFadeout();
@@ -533,6 +531,7 @@ public:
void room_61(int);
void room_62(int);
void room_63(int);
+ void room_102(int);
void animation_1_1();
void animation_2_1();
@@ -683,6 +682,7 @@ public:
void update_62();
void update_62_pre();
void update_63();
+ void update_102();
private:
int _lang;
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index cf503b8010..a3eaa13d5a 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -95,6 +95,7 @@ void DrasculaEngine::setupRoomsTable() {
ROOM(room_61);
ROOM(room_62);
ROOM(room_63);
+ ROOM(room_102);
PREUPDATEROOM(update_1_pre);
PREUPDATEROOM(update_3_pre);
@@ -149,6 +150,7 @@ void DrasculaEngine::setupRoomsTable() {
UPDATEROOM(update_61);
UPDATEROOM(update_62);
UPDATEROOM(update_63);
+ UPDATEROOM(update_102);
}
bool DrasculaEngine::roomParse(RoomTalkAction* roomActions, int actionCount, int fl) {
@@ -1075,8 +1077,8 @@ void DrasculaEngine::room_63(int fl) {
hasAnswer = 0;
}
-void DrasculaEngine::room_pendulum(int fl) {
- if (roomParse(roomPendulumActions, ARRAYSIZE(roomPendulumActions), fl))
+void DrasculaEngine::room_102(int fl) {
+ if (roomParse(room102Actions, ARRAYSIZE(room102Actions), fl))
return;
if (pickedObject == kVerbPick && fl == 101)
@@ -1121,8 +1123,6 @@ void DrasculaEngine::updateRefresh_pre() {
if (currentChapter == 1 && roomNumber == 16)
placeBJ();
- else if (roomNumber == 102)
- update_pendulum();
}
void DrasculaEngine::update_1_pre() {
@@ -1681,7 +1681,7 @@ void DrasculaEngine::update_63() {
copyRect(1, 154, 83, 122, 131, 44, drawSurface3, screenSurface);
}
-void DrasculaEngine::update_pendulum() {
+void DrasculaEngine::update_102() {
int pendulum_x[] = {40, 96, 152, 208, 264, 40, 96, 152, 208, 208, 152, 264, 40, 96, 152, 208, 264};
int difference;
@@ -2031,7 +2031,7 @@ bool DrasculaEngine::checkAction(int fl) {
else if (pickedObject == kVerbTalk && fl == 50)
talk(314);
else if (roomNumber == 102)
- room_pendulum(fl);
+ room_102(fl);
else if (roomNumber == 60) {
if (room_60(fl))
return true;
diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h
index af899f441f..df4ad18556 100644
--- a/engines/drascula/staticdata.h
+++ b/engines/drascula/staticdata.h
@@ -511,7 +511,7 @@ RoomTalkAction room63Actions[] = {
{ -1, kVerbTalk, 108, 333}
};
-RoomTalkAction roomPendulumActions[] = {
+RoomTalkAction room102Actions[] = {
// num action object speech
{ -1, kVerbLook, 100, 452},
// ----------------------------------