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

[sev at users.sourceforge.net]

Revision: 32558
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32558&view=rev
Author:   sev
Date:     2008-06-05 12:04:58 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
Pendulum room is room #102

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

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-06-05 15:15:20 UTC (rev 32557)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-06-05 19:04:58 UTC (rev 32558)
@@ -477,8 +477,6 @@
 	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 @@
 	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 @@
 	void update_62();
 	void update_62_pre();
 	void update_63();
+	void update_102();
 
 private:
 	int _lang;

Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp	2008-06-05 15:15:20 UTC (rev 32557)
+++ scummvm/trunk/engines/drascula/rooms.cpp	2008-06-05 19:04:58 UTC (rev 32558)
@@ -95,6 +95,7 @@
 	ROOM(room_61);
 	ROOM(room_62);
 	ROOM(room_63);
+	ROOM(room_102);
 
 	PREUPDATEROOM(update_1_pre);
 	PREUPDATEROOM(update_3_pre);
@@ -149,6 +150,7 @@
 	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 @@
 	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 @@
 
 	if (currentChapter == 1 && roomNumber == 16)
 		placeBJ();
-	else if (roomNumber == 102)
-		update_pendulum();
 }
 
 void DrasculaEngine::update_1_pre() {
@@ -1681,7 +1681,7 @@
 	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 @@
 			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;

Modified: scummvm/trunk/engines/drascula/staticdata.h
===================================================================
--- scummvm/trunk/engines/drascula/staticdata.h	2008-06-05 15:15:20 UTC (rev 32557)
+++ scummvm/trunk/engines/drascula/staticdata.h	2008-06-05 19:04:58 UTC (rev 32558)
@@ -511,7 +511,7 @@
 	{ -1,	kVerbTalk,		108,	333}
 };
 
-RoomTalkAction roomPendulumActions[] = {
+RoomTalkAction room102Actions[] = {
 	// num	action			object	speech
 	{ -1,	kVerbLook,		100,	452},
 	// ----------------------------------


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