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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Jun 9 12:11:42 CEST 2008


Revision: 32628
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32628&view=rev
Author:   thebluegr
Date:     2008-06-09 03:11:42 -0700 (Mon, 09 Jun 2008)

Log Message:
-----------
- drascula.dat is now read completely
- Removed the rest of the game static data (staticdata.h)
- Some naming convention fixes (added underscore to some shared variables)
- Renamed objeto -> object

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/actors.cpp
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/drascula.h
    scummvm/trunk/engines/drascula/interface.cpp
    scummvm/trunk/engines/drascula/objects.cpp
    scummvm/trunk/engines/drascula/rooms.cpp

Removed Paths:
-------------
    scummvm/trunk/engines/drascula/staticdata.h

Modified: scummvm/trunk/engines/drascula/actors.cpp
===================================================================
--- scummvm/trunk/engines/drascula/actors.cpp	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/actors.cpp	2008-06-09 10:11:42 UTC (rev 32628)
@@ -236,7 +236,7 @@
 									factor_red[curY + curHeight], frontSurface, screenSurface);
 		}
 	} else if (characterMoved == 1) {
-		curPos[0] = frameX[num_frame];
+		curPos[0] = _frameX[num_frame];
 		curPos[1] = frame_y + DIF_MASK_HARE;
 		curPos[2] = curX;
 		curPos[3] = curY;

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-06-09 10:11:42 UTC (rev 32628)
@@ -269,7 +269,7 @@
 		int soc = 0;
 		for (n = 0; n < 6; n++) {
 			soc = soc + CHARACTER_WIDTH;
-			frameX[n] = soc;
+			_frameX[n] = soc;
 		}
 	}
 
@@ -755,6 +755,7 @@
 
 bool DrasculaEngine::loadDrasculaDat() {
 	Common::File in;
+	int i;
 
 	in.open("drascula.dat");
 
@@ -792,92 +793,105 @@
 
 	_charMapSize = in.readUint16BE();
 	_charMap = (CharInfo *)malloc(sizeof(CharInfo) * _charMapSize);
-
-	for (int i = 0; i < _charMapSize; i++) {
+	for (i = 0; i < _charMapSize; i++) {
 		_charMap[i].inChar = in.readByte();
 		_charMap[i].mappedChar = in.readUint16BE();
 		_charMap[i].charType = in.readByte();
 	}
 
 	_itemLocationsSize = in.readUint16BE();
-	for (int i = 0; i < _itemLocationsSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
+	_itemLocations = (ItemLocation *)malloc(sizeof(ItemLocation) * _itemLocationsSize);
+	for (i = 0; i < _itemLocationsSize; i++) {
+		_itemLocations[i].x = in.readUint16BE();
+		_itemLocations[i].y = in.readUint16BE();
 	}
 
-	_xPolSize = in.readUint16BE();
-	for (int i = 0; i < _xPolSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
+	_polXSize = in.readUint16BE();
+	_polX = (int *)malloc(sizeof(int) * _polXSize);
+	_polY = (int *)malloc(sizeof(int) * _polXSize);
+	for (i = 0; i < _polXSize; i++) {
+		_polX[i] = in.readUint16BE();
+		_polY[i] = in.readUint16BE();
 	}
 
 	_verbBarXSize = in.readUint16BE();
-	for (int i = 0; i < _verbBarXSize; i++) {
-		in.readUint16BE();
+	_verbBarX = (int *)malloc(sizeof(int) * _verbBarXSize);
+	for (i = 0; i < _verbBarXSize; i++) {
+		_verbBarX[i] = in.readUint16BE();
 	}
 
 	_x1dMenuSize = in.readUint16BE();
-	for (int i = 0; i < _x1dMenuSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
+	_x1d_menu = (int *)malloc(sizeof(int) * _x1dMenuSize);
+	_y1d_menu = (int *)malloc(sizeof(int) * _x1dMenuSize);
+	for (i = 0; i < _x1dMenuSize; i++) {
+		_x1d_menu[i] = in.readUint16BE();
+		_y1d_menu[i] = in.readUint16BE();
 	}
 
 	_frameXSize = in.readUint16BE();
-	for (int i = 0; i < _frameXSize; i++) {
-		in.readUint16BE();
+	_frameX = (int *)malloc(sizeof(int) * _frameXSize);
+	for (i = 0; i < _frameXSize; i++) {
+		_frameX[i] = in.readUint16BE();
 	}
 
 	_candleXSize = in.readUint16BE();
-	for (int i = 0; i < _candleXSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
+	_candleX = (int *)malloc(sizeof(int) * _candleXSize);
+	_candleY = (int *)malloc(sizeof(int) * _candleXSize);
+	for (i = 0; i < _candleXSize; i++) {
+		_candleX[i] = in.readUint16BE();
+		_candleY[i] = in.readUint16BE();
 	}
 
 	_pianistXSize = in.readUint16BE();
-	for (int i = 0; i < _pianistXSize; i++) {
-		in.readUint16BE();
+	_pianistX = (int *)malloc(sizeof(int) * _pianistXSize);
+	for (i = 0; i < _pianistXSize; i++) {
+		_pianistX[i] = in.readUint16BE();
 	}
 
 	_drunkXSize = in.readUint16BE();
-	for (int i = 0; i < _drunkXSize; i++) {
-		in.readUint16BE();
+	_drunkX = (int *)malloc(sizeof(int) * _drunkXSize);
+	for (i = 0; i < _drunkXSize; i++) {
+		_drunkX[i] = in.readUint16BE();
 	}
 
 	_roomPreUpdatesSize = in.readUint16BE();
-	for (int i = 0; i < _roomPreUpdatesSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
+	_roomPreUpdates = (RoomUpdate *)malloc(sizeof(RoomUpdate) * _roomPreUpdatesSize);
+	for (i = 0; i < _roomPreUpdatesSize; i++) {
+		_roomPreUpdates[i].roomNum = in.readUint16BE();
+		_roomPreUpdates[i].flag = in.readUint16BE();
+		_roomPreUpdates[i].flagValue = in.readUint16BE();
+		_roomPreUpdates[i].sourceX = in.readUint16BE();
+		_roomPreUpdates[i].sourceY = in.readUint16BE();
+		_roomPreUpdates[i].destX = in.readUint16BE();
+		_roomPreUpdates[i].destY = in.readUint16BE();
+		_roomPreUpdates[i].width = in.readUint16BE();
+		_roomPreUpdates[i].height = in.readUint16BE();
+		_roomPreUpdates[i].type = in.readUint16BE();
 	}
 
 	_roomUpdatesSize = in.readUint16BE();
-	for (int i = 0; i < _roomUpdatesSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
+	_roomUpdates = (RoomUpdate *)malloc(sizeof(RoomUpdate) * _roomUpdatesSize);
+	for (i = 0; i < _roomUpdatesSize; i++) {
+		_roomUpdates[i].roomNum = in.readUint16BE();
+		_roomUpdates[i].flag = in.readUint16BE();
+		_roomUpdates[i].flagValue = in.readUint16BE();
+		_roomUpdates[i].sourceX = in.readUint16BE();
+		_roomUpdates[i].sourceY = in.readUint16BE();
+		_roomUpdates[i].destX = in.readUint16BE();
+		_roomUpdates[i].destY = in.readUint16BE();
+		_roomUpdates[i].width = in.readUint16BE();
+		_roomUpdates[i].height = in.readUint16BE();
+		_roomUpdates[i].type = in.readUint16BE();
 	}
 
 	_roomActionsSize = in.readUint16BE();
-	for (int i = 0; i < _roomActionsSize; i++) {
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
-		in.readUint16BE();
+	_roomActions = (RoomTalkAction *)malloc(sizeof(RoomTalkAction) * _roomActionsSize);
+	for (i = 0; i < _roomActionsSize; i++) {
+		_roomActions[i].room = in.readUint16BE();
+		_roomActions[i].chapter = in.readUint16BE();
+		_roomActions[i].action = in.readUint16BE();
+		_roomActions[i].objectID = in.readUint16BE();
+		_roomActions[i].speechID = in.readUint16BE();
 	}
 
 	_numLangs = in.readUint16BE();

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-06-09 10:11:42 UTC (rev 32628)
@@ -391,7 +391,7 @@
 	void delay(int ms);
 	bool confirmExit();
 	void screenSaver();
-	void chooseObject(int objeto);
+	void chooseObject(int object);
 	void addObject(int);
 	int removeObject(int osj);
 	void playFLI(const char *filefli, int vel);
@@ -673,7 +673,7 @@
 	int _charMapSize;
 
 	int _itemLocationsSize;
-	int _xPolSize;
+	int _polXSize;
 	int _verbBarXSize;
 	int _x1dMenuSize;
 	int _frameXSize;
@@ -700,18 +700,20 @@
 	char ***_textverbs;
 	char ***_textmisc;
 	char ***_textd1;
+	ItemLocation *_itemLocations;
+	int *_polX, *_polY;
+	int *_verbBarX;
+	int *_x1d_menu, *_y1d_menu;
+	int *_frameX;
+	int *_candleX, *_candleY;
+	int *_pianistX, *_drunkX;
+	RoomUpdate *_roomPreUpdates, *_roomUpdates;
+	RoomTalkAction *_roomActions;
 
 	char ***loadTexts(Common::File &in);
 	void freeTexts(char ***ptr);
 };
 
-
-extern const ItemLocation itemLocations[];
-extern int frameX[20];
-extern const int x_pol[44], y_pol[44];
-extern const int verbBarX[];
-extern const int x1d_menu[], y1d_menu[];
-
 } // End of namespace Drascula
 
 #endif /* DRASCULA_H */

Modified: scummvm/trunk/engines/drascula/interface.cpp
===================================================================
--- scummvm/trunk/engines/drascula/interface.cpp	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/interface.cpp	2008-06-09 10:11:42 UTC (rev 32628)
@@ -29,7 +29,7 @@
 
 void DrasculaEngine::selectVerbFromBar() {
 	for (int n = 0; n < 7; n++) {
-		if (mouseX > verbBarX[n] && mouseX < verbBarX[n + 1] && n > 0) {
+		if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1] && n > 0) {
 			selectVerb(n);
 			return;
 		}
@@ -82,7 +82,7 @@
 void DrasculaEngine::showMenu() {
 	int h, n, x;
 	char textIcon[13];
-
+	byte *srcSurface = (currentChapter == 6) ? tableSurface : frontSurface;
 	x = whichObject();
 	strcpy(textIcon, iconName[x]);
 
@@ -90,28 +90,24 @@
 		h = inventoryObjects[n];
 
 		if (h != 0) {
-			if (currentChapter == 6)
-				copyBackground(x_pol[n], y_pol[n], itemLocations[n].x, itemLocations[n].y,
-						OBJWIDTH, OBJHEIGHT, tableSurface, screenSurface);
-			else
-				copyBackground(x_pol[n], y_pol[n], itemLocations[n].x, itemLocations[n].y,
-						OBJWIDTH, OBJHEIGHT, frontSurface, screenSurface);
+			copyBackground(_polX[n], _polY[n], _itemLocations[n].x, _itemLocations[n].y,
+							OBJWIDTH, OBJHEIGHT, srcSurface, screenSurface);
 		}
-		copyRect(x1d_menu[h], y1d_menu[h], itemLocations[n].x, itemLocations[n].y,
+		copyRect(_x1d_menu[h], _y1d_menu[h], _itemLocations[n].x, _itemLocations[n].y,
 				OBJWIDTH, OBJHEIGHT, backSurface, screenSurface);
 	}
 
 	if (x < 7)
-		print_abc(textIcon, itemLocations[x].x - 2, itemLocations[x].y - 7);
+		print_abc(textIcon, _itemLocations[x].x - 2, _itemLocations[x].y - 7);
 }
 
 void DrasculaEngine::clearMenu() {
 	int n, verbActivated = 1;
 
 	for (n = 0; n < 7; n++) {
-		if (mouseX > verbBarX[n] && mouseX < verbBarX[n + 1])
+		if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1])
 			verbActivated = 0;
-		copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, verbBarX[n], 2,
+		copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, _verbBarX[n], 2,
 						OBJWIDTH, OBJHEIGHT, backSurface, screenSurface);
 		verbActivated = 1;
 	}

Modified: scummvm/trunk/engines/drascula/objects.cpp
===================================================================
--- scummvm/trunk/engines/drascula/objects.cpp	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/objects.cpp	2008-06-09 10:11:42 UTC (rev 32628)
@@ -27,7 +27,7 @@
 
 namespace Drascula {
 
-void DrasculaEngine::pickObject(int objeto) {
+void DrasculaEngine::pickObject(int object) {
 	if (currentChapter == 6)
 		loadPic("iconsp.alg", backSurface);
 	else if (currentChapter == 4)
@@ -36,14 +36,14 @@
 		loadPic("icons3.alg", backSurface);
 	else
 		loadPic("icons.alg", backSurface);
-	chooseObject(objeto);
+	chooseObject(object);
 	if (currentChapter == 2)
 		loadPic(menuBackground, backSurface);
 	else
 		loadPic(99, backSurface);
 }
 
-void DrasculaEngine::chooseObject(int objeto) {
+void DrasculaEngine::chooseObject(int object) {
 	if (currentChapter == 5) {
 		if (takeObject == 1 && menuScreen == 0 && pickedObject != 16)
 			addObject(pickedObject);
@@ -51,9 +51,9 @@
 		if (takeObject == 1 && menuScreen == 0)
 			addObject(pickedObject);
 	}
-	copyBackground(x1d_menu[objeto], y1d_menu[objeto], 0, 0, OBJWIDTH,OBJHEIGHT, backSurface, drawSurface3);
+	copyBackground(_x1d_menu[object], _y1d_menu[object], 0, 0, OBJWIDTH,OBJHEIGHT, backSurface, drawSurface3);
 	takeObject = 1;
-	pickedObject = objeto;
+	pickedObject = object;
 }
 
 int DrasculaEngine::removeObject(int obj) {
@@ -214,8 +214,9 @@
 	int n = 0;
 
 	for (n = 1; n < 43; n++) {
-		if (mouseX > itemLocations[n].x && mouseY > itemLocations[n].y
-				&& mouseX < itemLocations[n].x + OBJWIDTH && mouseY < itemLocations[n].y + OBJHEIGHT)
+		if (mouseX > _itemLocations[n].x && mouseY > _itemLocations[n].y &&
+			mouseX < _itemLocations[n].x + OBJWIDTH && 
+			mouseY < _itemLocations[n].y + OBJHEIGHT)
 			break;
 	}
 

Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/rooms.cpp	2008-06-09 10:11:42 UTC (rev 32628)
@@ -26,7 +26,6 @@
 #include "common/array.h"
 
 #include "drascula/drascula.h"
-#include "drascula/staticdata.h"
 
 namespace Drascula {
 
@@ -121,16 +120,16 @@
 bool DrasculaEngine::roomParse(int rN, int fl) {
 	bool seen = false;
 
-	for (int i = 0; i < ARRAYSIZE(roomActions); i++) {
-		if (roomActions[i].room == rN) {
+	for (int i = 0; i < ARRAYSIZE(_roomActions); i++) {
+		if (_roomActions[i].room == rN) {
 			seen = true;
-			if (roomActions[i].chapter == currentChapter ||
-				roomActions[i].chapter == -1) {
-				if (roomActions[i].action == pickedObject ||
-					roomActions[i].action == kVerbDefault) {
-					if (roomActions[i].objectID == fl ||
-						roomActions[i].objectID == -1) {
-						talk(roomActions[i].speechID);
+			if (_roomActions[i].chapter == currentChapter ||
+				_roomActions[i].chapter == -1) {
+				if (_roomActions[i].action == pickedObject ||
+					_roomActions[i].action == kVerbDefault) {
+					if (_roomActions[i].objectID == fl ||
+						_roomActions[i].objectID == -1) {
+						talk(_roomActions[i].speechID);
 						hasAnswer = 1;
 						return true;
 					}
@@ -1014,19 +1013,19 @@
 
 void DrasculaEngine::updateRefresh() {
 	// Check generic updaters
-	for (int i = 0; i < ARRAYSIZE(roomUpdates); i++) {
-		if (roomUpdates[i].roomNum == roomNumber) {
-			if (roomUpdates[i].flag < 0 || 
-				flags[roomUpdates[i].flag] == roomUpdates[i].flagValue) {
-				if (roomUpdates[i].type == 0) {
-					copyBackground(roomUpdates[i].sourceX, roomUpdates[i].sourceY,
-								   roomUpdates[i].destX, roomUpdates[i].destY,
-								   roomUpdates[i].width, roomUpdates[i].height,
+	for (int i = 0; i < ARRAYSIZE(_roomUpdates); i++) {
+		if (_roomUpdates[i].roomNum == roomNumber) {
+			if (_roomUpdates[i].flag < 0 || 
+				flags[_roomUpdates[i].flag] == _roomUpdates[i].flagValue) {
+				if (_roomUpdates[i].type == 0) {
+					copyBackground(_roomUpdates[i].sourceX, _roomUpdates[i].sourceY,
+								   _roomUpdates[i].destX, _roomUpdates[i].destY,
+								   _roomUpdates[i].width, _roomUpdates[i].height,
 								   drawSurface3, screenSurface);
 				} else {
-					copyRect(roomUpdates[i].sourceX, roomUpdates[i].sourceY,
-							 roomUpdates[i].destX, roomUpdates[i].destY,
-							 roomUpdates[i].width, roomUpdates[i].height,
+					copyRect(_roomUpdates[i].sourceX, _roomUpdates[i].sourceY,
+							 _roomUpdates[i].destX, _roomUpdates[i].destY,
+							 _roomUpdates[i].width, _roomUpdates[i].height,
 							 drawSurface3, screenSurface);
 				}
 			}
@@ -1052,19 +1051,19 @@
 
 void DrasculaEngine::updateRefresh_pre() {
 	// Check generic preupdaters
-	for (int i = 0; i < ARRAYSIZE(roomPreUpdates); i++) {
-		if (roomPreUpdates[i].roomNum == roomNumber) {
-			if (roomPreUpdates[i].flag < 0 ||
-				flags[roomPreUpdates[i].flag] == roomPreUpdates[i].flagValue) {
-				if (roomPreUpdates[i].type == 0) {
-					copyBackground(roomPreUpdates[i].sourceX, roomPreUpdates[i].sourceY,
-								   roomPreUpdates[i].destX, roomPreUpdates[i].destY,
-								   roomPreUpdates[i].width, roomPreUpdates[i].height,
+	for (int i = 0; i < ARRAYSIZE(_roomPreUpdates); i++) {
+		if (_roomPreUpdates[i].roomNum == roomNumber) {
+			if (_roomPreUpdates[i].flag < 0 ||
+				flags[_roomPreUpdates[i].flag] == _roomPreUpdates[i].flagValue) {
+				if (_roomPreUpdates[i].type == 0) {
+					copyBackground(_roomPreUpdates[i].sourceX, _roomPreUpdates[i].sourceY,
+								   _roomPreUpdates[i].destX, _roomPreUpdates[i].destY,
+								   _roomPreUpdates[i].width, _roomPreUpdates[i].height,
 								   drawSurface3, screenSurface);
 				} else {
-					copyRect(roomPreUpdates[i].sourceX, roomPreUpdates[i].sourceY,
-							 roomPreUpdates[i].destX, roomPreUpdates[i].destY,
-							 roomPreUpdates[i].width, roomPreUpdates[i].height,
+					copyRect(_roomPreUpdates[i].sourceX, _roomPreUpdates[i].sourceY,
+							 _roomPreUpdates[i].destX, _roomPreUpdates[i].destY,
+							 _roomPreUpdates[i].width, _roomPreUpdates[i].height,
 							 drawSurface3, screenSurface);
 				}
 			}
@@ -1209,22 +1208,22 @@
 void DrasculaEngine::update_14_pre() {
 	int difference;
 
-	copyBackground(123, candleY[actorFrames[kFrameCandles]], 142, 14, 39, 13, drawSurface3, screenSurface);
-	copyBackground(candleX[actorFrames[kFrameCandles]], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
+	copyBackground(123, _candleY[actorFrames[kFrameCandles]], 142, 14, 39, 13, drawSurface3, screenSurface);
+	copyBackground(_candleX[actorFrames[kFrameCandles]], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
 
 	if (blinking == 5)
 		copyBackground(1, 149, 127, 52, 9, 5, drawSurface3, screenSurface);
 	if (curX > 101 && curX < 155)
 		copyBackground(31, 138, 178, 51, 18, 16, drawSurface3, screenSurface);
 	if (flags[11] == 0)
-		copyBackground(pianistX[actorFrames[kFramePianist]], 157, 245, 130, 29, 42, drawSurface3, screenSurface);
+		copyBackground(_pianistX[actorFrames[kFramePianist]], 157, 245, 130, 29, 42, drawSurface3, screenSurface);
 	else if (flags[5] == 0)
 		copyBackground(145, 139, 228, 112, 47, 60, extraSurface, screenSurface);
 	else
 		copyBackground(165, 140, 229, 117, 43, 59, drawSurface3, screenSurface);
 
 	if (flags[12] == 1)
-		copyBackground(drunkX[actorFrames[kFrameDrunk]], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
+		copyBackground(_drunkX[actorFrames[kFrameDrunk]], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
 	difference = getTime() - savedTime;
 	if (difference > 6) {
 		if (flags[12] == 1) {
@@ -1355,7 +1354,7 @@
 	if (flags[5] == 0)
 		placeDrascula();
 
-	copyBackground(123, candleY[actorFrames[kFrameCandles]], 142, 14, 39, 13, drawSurface3, screenSurface);
+	copyBackground(123, _candleY[actorFrames[kFrameCandles]], 142, 14, 39, 13, drawSurface3, screenSurface);
 
 	if (flag_tv == 1)
 		copyBackground(114, 158, 8, 30, 8, 23, drawSurface3, screenSurface);
@@ -1382,8 +1381,8 @@
 void DrasculaEngine::update_62_pre() {
 	int difference;
 
-	copyBackground(123, candleY[actorFrames[kFrameCandles]], 142, 14, 39, 13, drawSurface3, screenSurface);
-	copyBackground(candleX[actorFrames[kFrameCandles]], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
+	copyBackground(123, _candleY[actorFrames[kFrameCandles]], 142, 14, 39, 13, drawSurface3, screenSurface);
+	copyBackground(_candleX[actorFrames[kFrameCandles]], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
 
 	if (blinking == 5)
 		copyBackground(1, 149, 127, 52, 9, 5, drawSurface3, screenSurface);
@@ -1392,14 +1391,14 @@
 		copyBackground(31, 138, 178, 51, 18, 16, drawSurface3, screenSurface);
 
 	if (flags[11] == 0)
-		copyBackground(pianistX[actorFrames[kFramePianist]], 157, 245, 130, 29, 42, drawSurface3, screenSurface);
+		copyBackground(_pianistX[actorFrames[kFramePianist]], 157, 245, 130, 29, 42, drawSurface3, screenSurface);
 	else if (flags[5] == 0)
 		copyBackground(145, 139, 228, 112, 47, 60, extraSurface, screenSurface);
 	else
 		copyBackground(165, 140, 229, 117, 43, 59, drawSurface3, screenSurface);
 
 	if (flags[12] == 1)
-		copyBackground(drunkX[actorFrames[kFrameDrunk]], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
+		copyBackground(_drunkX[actorFrames[kFrameDrunk]], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
 
 	difference = getTime() - savedTime;
 	if (difference > 6) {
@@ -1428,7 +1427,7 @@
 
 	if (curY + curHeight < 89) {
 		copyRect(205, 1, 180, 9, 82, 80, drawSurface3, screenSurface);
-		copyBackground(drunkX[actorFrames[kFrameDrunk]], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
+		copyBackground(_drunkX[actorFrames[kFrameDrunk]], 82, 170, 50, 40, 53, drawSurface3, screenSurface);
 	}
 }
 
@@ -1774,7 +1773,7 @@
 		soc = 0;
 		for (l = 0; l < 6; l++) {
 			soc += curWidth;
-			frameX[l] = soc;
+			_frameX[l] = soc;
 		}
 	}
 

Deleted: scummvm/trunk/engines/drascula/staticdata.h
===================================================================
--- scummvm/trunk/engines/drascula/staticdata.h	2008-06-09 03:59:16 UTC (rev 32627)
+++ scummvm/trunk/engines/drascula/staticdata.h	2008-06-09 10:11:42 UTC (rev 32628)
@@ -1,590 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef STATICDATA_H
-#define STATICDATA_H
-
-#include "drascula/drascula.h"
-
-namespace Drascula {
-
-const ItemLocation itemLocations[] = {
-	{   0,   0 },							  // empty
-	{   5,  10 }, {  50,  10 }, {  95,  10 }, // 1-3
-	{ 140,  10 }, { 185,  10 }, { 230,  10 }, // 4-6
-	{ 275,  10 }, {   5,  40 }, {  50,  40 }, // 7-9
-	{  95,  40 }, { 140,  40 }, { 185,  40 }, // 10-12
-	{ 230,  40 }, { 275,  40 }, {   5,  70 }, // 13-15
-	{  50,  70 }, {  95,  70 }, { 140,  70 }, // 16-18
-	{ 185,  70 }, { 230,  70 }, { 275,  70 }, // 19-21
-	{   5, 100 }, {  50, 100 }, {  95, 100 }, // 22-24
-	{ 140, 100 }, { 185, 100 }, { 230, 100 }, // 25-27
-	{ 275, 100 }, {   5, 130 }, {  50, 130 }, // 28-30
-	{  95, 130 }, { 140, 130 }, { 185, 130 }, // 31-33
-	{ 230, 130 }, { 275, 130 }, {   5, 160 }, // 34-36
-	{  50, 160 }, {  95, 160 }, { 140, 160 }, // 37-39
-	{ 185, 160 }, { 230, 160 }, { 275, 160 }, // 40-42
-	{ 275, 160 }							  // 43
-};
-
-const int x_pol[44]  = {0, 1, 42, 83, 124, 165, 206, 247, 83, 1, 206,
-						1, 42, 83, 124, 165, 206, 247, 83, 1, 206,
-						247, 83, 165, 1, 206, 42, 124, 83, 1, 247,
-						83, 165, 1, 206, 42, 124, 83, 1, 247, 42,
-						1, 165, 206};
-const int y_pol[44]  = {0, 1, 1, 1, 1, 1, 1, 1, 27, 27, 1,
-						27, 27, 27, 27, 27, 27, 27, 1, 1, 27,
-						1, 1, 1, 1, 1, 27, 27, 27, 27, 27,
-						1, 1, 1, 1, 1, 27, 27, 27, 27, 27,
-						27, 1, 1};
-const int verbBarX[] = {6, 51, 96, 141, 186, 232, 276, 321};
-const int x1d_menu[] = {280, 40, 80, 120, 160, 200, 240, 0, 40, 80, 120,
-						160, 200, 240, 0, 40, 80, 120, 160, 200, 240, 0,
-						40, 80, 120, 160, 200, 240, 0};
-const int y1d_menu[] = {0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25,
-						50, 50, 50, 50, 50, 50, 50, 75, 75, 75, 75, 75, 75, 75, 100};
-int frameX[20]		 = {43, 87, 130, 173, 216, 259};
-int candleX[]		 = {14, 19, 24};
-int candleY[]		 = {158, 172, 186};
-int pianistX[]		 = {1, 91, 61, 31, 91, 31, 1, 61, 31};
-int drunkX[]		 = {1, 42, 83, 124, 165, 206, 247, 1};
-
-const RoomUpdate roomPreUpdates[] = {
-	// room		flag	val		x1		y1		x2		y2		width	height	type
-	{  3,		 3,		1,		258,	110,	 85,	 44,	 23,	53,		0	},
-	//-------------------------------------------------------------------------------
-	{  5,		 8,		0,		256,	152,	208,	 67,	 27,	40,		0	},
-	//-------------------------------------------------------------------------------
-	{  6,		 0,		0,		  3,	103,	185,	 69,	 23,	76,		0	},
-	{  6,		 1,		0,		 97,	117,	 34,	148,	 36,	31,		0	},
-	{  6,		 2,		0,		 28,	100,	219,	 72,	 64,	97,		0	},
-	//-------------------------------------------------------------------------------
-	{  7,		35,		0,		  1,	 72,	158,	162,	 19,	12,		0	},
-	//-------------------------------------------------------------------------------
-	{ 12,		16,		0,		  1,	131,	106,	117,	 55,	68,		0	},
-	//-------------------------------------------------------------------------------
-	{ 17,		15,		1,		  1,	135,	108,	 65,	 44,	63,		0	},
-	//-------------------------------------------------------------------------------
-	{ 21,		 0,		1,		  2,	171,	 84,	126,	 17,	26,		0	},
-	{ 21,		10,		1,		 20,	163,	257,	149,	 14,	34,		0	},
-	//-------------------------------------------------------------------------------
-	{ 22,		24,		1,		  2,	187,	107,	106,	 62,	12,		0	},
-	{ 22,		27,		0,		 32,	181,	203,	 88,	 13,	 5,		0	},
-	{ 22,		26,		0,		  2,	133,	137,	 83,	 29,	53,		0	},
-	{ 22,		26,		1,		 65,	174,	109,	145,	 55,	25,		0	},
-	//-------------------------------------------------------------------------------
-	{ 24,		 1,		1,		  1,	163,	225,	124,	 12,	36,		0	},
-	{ 24,		 2,		1,		 14,	153,	 30,	107,	 23,	46,		0	},
-	//-------------------------------------------------------------------------------
-	{ 26,		 2,		1,		  1,	130,	 87,	 44,	 50,	69,		0	},
-	{ 26,		12,		1,		 52,	177,	272,	103,	 27,	22,		0	},
-	{ 26,		18,		0,		 80,	133,	199,	 95,	 50,	66,		0	},
-	//-------------------------------------------------------------------------------
-	{ 27,		 5,		1,		  1,	175,	 59,	109,	 17,	24,		1	},
-	{ 27,		 6,		1,		 19,	177,	161,	103,	 18,	22,		1	},
-	//-------------------------------------------------------------------------------
-	{ 29,		 4,		1,		 12,	113,	247,	 49,	 41,	84,		0	},
-	//-------------------------------------------------------------------------------
-	{ 30,		 4,		1,		  1,	148,	148,	 66,	 35,	51,		0	},
-	{ 30,		16,		1,		 37,	173,	109,	 84,	 20,	26,		0	},
-	//-------------------------------------------------------------------------------
-	{ 31,		13,		1,		  1,	163,	116,	 41,	 61,	36,		0	},
-	{ 31,		 5,		1,		  1,	 78,	245,	 63,	 30,	84,		0	},
-	//-------------------------------------------------------------------------------
-	{ 34,		 7,		1,		 99,	127,	 73,	 41,	 79,	72,		0	},
-	{ 34,		 8,		1,		 36,	129,	153,	 41,	 62,	65,		0	},
-	//-------------------------------------------------------------------------------
-	{ 35,		14,		1,		  1,	 86,	246,	 65,	 68,	87,		0	},
-	{ 35,		17,		1,		 70,	150,	118,	 52,	 40,	23,		0	},
-	//-------------------------------------------------------------------------------
-	{ 49,		 6,		0,		  2,	136,	176,	 81,	 49,	62,		0	},
-	//-------------------------------------------------------------------------------
-	{ 53,		 1,		0,		  2,	113,	205,	 50,	 38,	86,		1	},
-	{ 53,		 2,		0,		 41,	159,	 27,	117,	 25,	40,		0	},
-	{ 53,		 9,		1,		 67,	184,	 56,	 93,	 32,	15,		0	},
-	//-------------------------------------------------------------------------------
-	{ 54,		 5,		1,		168,	156,	187,	111,	  7,	11,		0	},
-	{ 54,		12,		1,		 16,	156,	190,	 64,	 18,	24,		0	},
-	//-------------------------------------------------------------------------------
-	{ 56,		10,		0,		  2,	126,	 42,	 67,	 57,	67,		0	},
-	{ 56,		11,		1,		 60,	160,	128,	 97,	103,	38,		0	},
-	//-------------------------------------------------------------------------------
-	{ 58,		 0,		0,		  1,	156,	143,	120,	120,	43,		0	},
-	{ 58,		 1,		2,		252,	171,	173,	116,	 25,	28,		1	},
-	//-------------------------------------------------------------------------------
-	{ 59,		 4,		0,		  1,	146,	 65,	106,	 83,	40,		1	}
-};
-
-const RoomUpdate roomUpdates[] = {
-	// room		flag	val		x1		y1		x2		y2		width	height	type
-	{  5,		 -1,	-1,		114,	130,	211,	 87,	109,	 69,	1	},
-	{ 15,		 -1,	-1,		  1,	154,	 83,	122,	131,	 44,	1	},
-	{ 17,		 -1,	-1,		 48,	135,	 78,	139,	 80,	 30,	1	},
-	{ 18,		 24,	 1,		177,	  1,	 69,	 29,	142,	130,	1	},
-	{ 18,		 -1,	-1,		105,	132,	109,	108,	196,	 65,	1	},
-	{ 20,		 -1,	-1,		  1,	137,	106,	121,	213,	 61,	1	},
-	{ 27,		 -1,	-1,		 38,	177,	103,	171,	 21,	 22,	1	},
-	{ 27,		 -1,	-1,		 60,	162,	228,	156,	 18,	 37,	1	},
-	{ 29,		 -1,	-1,		  1,	180,	150,	126,	 10,	 17,	1	},
-	{ 31,		 -1,	-1,		 63,	190,	223,	157,	 17,	  9,	1	},
-	{ 34,		 -1,	-1,		  5,	171,	234,	126,	 29,	 23,	1	},
-	{ 35,		 -1,	-1,		  1,	174,	 54,	152,	195,	 25,	1	},
-	{ 50,		 -1,	-1,		  4,	153,	118,	 95,	 67,	 44,	1	},
-	{ 57,		 -1,	-1,		  7,	113,	166,	 61,	 62,	 82,	1	},
-	{ 61,		 -1,	-1,		  1,	154,	 83,	122,	131,	 44,	1	},
-	{ 63,		 -1,	-1,		  1,	154,	 83,	122,	131,	 44,	1	},
-};
-
-// Note: default action needs to be LAST for each group
-// of actions with the same number
-RoomTalkAction roomActions[] = {
-	//room	num	action			object	speech
-	{ 0,	1, 	kVerbLook,		-1,		 54 },
-	{ 0,	1,	kVerbMove,		-1,		 19 },
-	{ 0,	1,	kVerbPick,		-1,		 11 },
-	{ 0,	1,	kVerbOpen,		-1,		  9 },
-	{ 0,	1,	kVerbClose,		-1,		  9 },
-	{ 0,	1,	kVerbTalk,		-1,		 16 },
-	{ 0,	1,	kVerbDefault,	-1,		 11 },
-	// ----------------------------------
-	{ 0,	2,	kVerbMove,		-1,		 19 },
-	{ 0,	2,	kVerbOpen,		-1,		  9 },
-	{ 0,	2,	kVerbClose,		-1,		  9 },
-	{ 0,	2,	kVerbTalk,		-1,		 16 },
-	// ----------------------------------
-	{ 0,	3,	kVerbLook,		-1,		316 },
-	{ 0,	3,	kVerbMove,		-1,		317 },
-	{ 0,	3,	kVerbPick,		-1,		318 },
-	{ 0,	3,	kVerbOpen,		-1,		319 },
-	{ 0,	3,	kVerbClose,		-1,		319 },
-	{ 0,	3,	kVerbTalk,		-1,		320 },
-	{ 0,	3,	kVerbDefault,	-1,		318 },
-	// ----------------------------------
-	{ 0,	4,	kVerbMove,		-1,		 19 },
-	{ 0,	4,	kVerbOpen,		-1,		  9 },
-	{ 0,	4,	kVerbClose,		-1,		  9 },
-	{ 0,	4,	kVerbTalk,		-1,		 16 },
-	// ----------------------------------
-	{ 0,	5,	kVerbOpen,		-1,		  9 },
-	{ 0,	5,	kVerbClose,		-1,		  9 },
-	{ 0,	5,	kVerbTalk,		-1,		 16 },
-	// ----------------------------------
-	{ 0,	6,	kVerbMove,		-1,		 19 },
-	{ 0,	6,	kVerbOpen,		-1,		  9 },
-	{ 0,	6,	kVerbClose,		-1,		  9 },
-	{ 0,	6,	kVerbTalk,		-1,		 16 },
-	// ==================================
-	{ 1,	-1,	kVerbPick,		118,	  5 },
-	{ 1,	-1,	kVerbOpen,		118,	  3 },
-	{ 1,	-1,	kVerbClose,		118,	  4 },
-	{ 1,	-1,	kVerbTalk,		118,	  6 },
-	// ----------------------------------
-	{ 1,	-1,	kVerbLook,		119,	  8 },
-	{ 1,	-1,	kVerbMove,		119,	 13 },
-	{ 1,	-1,	kVerbClose,		119,	 10 },
-	{ 1,	-1,	kVerbTalk,		119,	 12 },
-	// ----------------------------------
-	{ 1,	-1,	kVerbMove,		120,	 13 },
-	{ 1,	-1,	kVerbOpen,		120,	 18 },
-	{ 1,	-1,	kVerbTalk,		120,	 15 },
-	// ==================================
-	{ 3,	-1,	kVerbLook,		129,	 21 },
-	{ 3,	-1,	kVerbPick,		129,	  5 },
-	{ 3,	-1,	kVerbMove,		129,	 24 },
-	{ 3,	-1,	kVerbOpen,		129,	 22 },
-	{ 3,	-1,	kVerbClose,		129,	 10 },
-	// ----------------------------------
-	{ 3,	-1,	kVerbLook,		131,	 27 },
-	{ 3,	-1,	kVerbPick,		131,	  5 },
-	{ 3,	-1,	kVerbMove,		131,	 24 },
-	{ 3,	-1,	kVerbOpen,		131,	 22 },
-	{ 3,	-1,	kVerbClose,		131,	 10 },
-	{ 3,	-1,	kVerbTalk,		131,	 23 },
-	// ----------------------------------
-	{ 3,	-1,	kVerbLook,		132,	 28 },
-	{ 3,	-1,	kVerbPick,		132,	  5 },
-	{ 3,	-1,	kVerbMove,		132,	 24 },
-	{ 3,	-1,	kVerbOpen,		132,	 22 },
-	{ 3,	-1,	kVerbClose,		132,	 10 },
-	{ 3,	-1,	kVerbTalk,		132,	 23 },
-	// ----------------------------------
-	{ 3,	-1,	kVerbLook,		133,	321 },
-	{ 3,	-1,	kVerbPick,		133,	 31 },
-	{ 3,	-1,	kVerbMove,		133,	 34 },
-	{ 3,	-1,	kVerbOpen,		133,	 30 },
-	{ 3,	-1,	kVerbClose,		133,	 10 },
-	// ----------------------------------
-	{ 3,	-1,	kVerbLook,		166,	 55 },
-	{ 3,	-1,	kVerbPick,		166,	  7 },
-	// ----------------------------------
-	{ 3,	-1,	kVerbLook,		211,	184 },
-	// ==================================
-	{ 4,	-1,	kVerbLook,		189,	182 },
-	// ----------------------------------
-	{ 4,	-1,	kVerbLook,		207,	175 },
-	{ 4,	-1,	kVerbTalk,		207,	176 },
-	// ----------------------------------
-	{ 4,	-1,	kVerbLook,		208,	177 },
-	// ----------------------------------
-	{ 4,	-1,	kVerbLook,		209,	179 },
-	// ----------------------------------
-	{ 4,	-1,	kVerbLook,		210,	180 },
-	{ 4,	-1,	kVerbOpen,		210,	181 },
-	// ==================================
-	{ 5,	-1,	kVerbMove,		136,	 13 },
-	{ 5,	-1,	kVerbOpen,		136,	 18 },
-	{ 5,	-1,	kVerbTalk,		136,	 15 },
-	// ----------------------------------
-	{ 5,	-1,	kVerbLook,		212,	187 },
-	{ 5,	-1,	kVerbTalk,		212,	188 },
-	// ----------------------------------
-	{ 5,	-1,	kVerbLook,		213,	189 },
-	{ 5,	-1,	kVerbOpen,		213,	190 },
-	// ==================================
-	{ 6,	-1,	kVerbPick,		144,	 43 },
-	// ----------------------------------
-	{ 6,	-1,	kVerbLook,		138,	 35 },
-	{ 6,	-1,	kVerbTalk,		138,	  6 },
-	// ----------------------------------
-	{ 6,	-1,	kVerbLook,		143,	 37 },
-	{ 6,	-1,	kVerbPick,		143,	  7 },
-	{ 6,	-1,	kVerbMove,		143,	  7 },
-	{ 6,	-1,	kVerbTalk,		143,	 38 },
-	// ----------------------------------
-	{ 6,	-1,	kVerbLook,		139,	 36 },
-	// ----------------------------------
-	{ 6,	-1,	kVerbLook,		140,	147 },
-	// ==================================
-	{ 7,	-1,	kVerbLook,		164,	 35 },
-	// ----------------------------------
-	{ 7,	-1,	kVerbLook,		169,	 44 },
-	// ==================================
-	{ 9,	-1,	kVerbLook,		150,	 35 },
-	{ 9,	-1,	kVerbTalk,		150,	  6 },
-	// ----------------------------------
-	{ 9,	-1,	kVerbLook,		 51,	 60 },
-	// ==================================
-	{ 12,	-1,	kVerbLook,		154,	329 },
-	{ 12,	-1,	kVerbTalk,		154,	330 },
-	// ----------------------------------
-	{ 12,	-1,	kVerbMove,		155,	 48 },
-	{ 12,	-1,	kVerbTalk,		155,	331 },
-	// ----------------------------------
-	{ 12,	-1,	kVerbLook,		156,	 35 },
-	{ 12,	-1,	kVerbMove,		156,	 48 },
-	{ 12,	-1,	kVerbTalk,		156,	 50 },
-	// ==================================
-	{ 14,	-1,	kVerbLook,		200,	165 },
-	// ----------------------------------
-	{ 14,	-1,	kVerbLook,		201,	166 },
-	// ----------------------------------
-	{ 14,	-1,	kVerbLook,		202,	167 },
-	// ----------------------------------
-	{ 14,	-1,	kVerbLook,		203,	168 },
-	{ 14,	-1,	kVerbPick,		203,	170 },
-	{ 14,	-1,	kVerbMove,		203,	170 },
-	{ 14,	-1,	kVerbTalk,		203,	169 },
-	// ----------------------------------
-	{ 14,	-1,	kVerbLook,		204,	171 },
-	// ==================================
-	{ 15,	-1,	kVerbTalk,		188,	333 },
-	{ 15,	-1,	kVerbLook,		188,	334 },
-	// ----------------------------------
-	{ 15,	-1,	kVerbLook,		205,	172 },
-	// ----------------------------------
-	{ 15,	-1,	kVerbLook,		206,	173 },
-	{ 15,	-1,	kVerbMove,		206,	174 },
-	{ 15,	-1,	kVerbOpen,		206,	174 },
-	// ==================================
-	{ 16,	-1,	kVerbTalk,		163,	  6 },
-	// ----------------------------------
-	{ 16,	-1,	kVerbLook,		183,	340 },
-	// ----------------------------------
-	{ 16,	-1,	kVerbLook,		185,	 37 },
-	{ 16,	-1,	kVerbPick,		185,	  7 },
-	{ 16,	-1,	kVerbMove,		185,	  7 },
-	{ 16,	-1,	kVerbTalk,		185,	 38 },
-	// ----------------------------------
-	{ 16,	-1,	kVerbTalk,		187,	345 },
-	// ==================================
-	{ 18,	-1,	kVerbLook,		181,	348 },
-	// ----------------------------------
-	{ 18,	-1,	kVerbLook,		182,	154 },
-	// ==================================
-	{ 19,	-1,	kVerbLook,		214,	191 },
-	// ==================================
-	{ 22,	-1,	kVerbPick,		140,	  7 },
-	// ----------------------------------
-	{ 22,	-1,	kVerbLook,		 52,	497 },
-	{ 22,	-1,	kVerbTalk,		 52,	498 },
-	// ==================================
-	{ 24,	-1,	kVerbLook,		151,	461 },
-	// ==================================
-	{ 26,	-1,	kVerbOpen,		167,	467 },
-	// ----------------------------------
-	{ 26,	-1,	kVerbLook,		164,	470 },
-	{ 26,	-1,	kVerbOpen,		164,	471 },
-	// ----------------------------------
-	{ 26,	-1,	kVerbLook,		163,	472 },
-	{ 26,	-1,	kVerbPick,		163,	473 },
-	// ----------------------------------
-	{ 26,	-1,	kVerbLook,		165,	474 },
-	// ----------------------------------
-	{ 26,	-1,	kVerbLook,		168,	476 },
-	{ 26,	-1,	kVerbPick,		168,	477 },
-	// ==================================
-	{ 27,	-1,	kVerbLook,		175,	429 },
-	// ==================================
-	{ 29,	-1,	kVerbLook,		152,	463 },
-	{ 29,	-1,	kVerbOpen,		152,	464 },
-	// ----------------------------------
-	{ 29,	-1,	kVerbLook,		153,	465 },
-	// ----------------------------------
-	{ 29,	-1,	kVerbPick,		154,	466 },
-	// ----------------------------------
-	{ 29,	-1,	kVerbOpen,		156,	467 },
-	// ==================================
-	{ 30,	-1,	kVerbOpen,		157,	468 },
-	// ----------------------------------
-	{ 30,	-1,	kVerbLook,		158,	469 },
-	// ==================================
-	{ 31,	-1,	kVerbLook,		161,	470 },
-	{ 31,	-1,	kVerbOpen,		161,	471 },
-	// ==================================
-	{ 34,	-1,	kVerbLook,		146,	458 },
-	{ 34,	-1,	kVerbPick,		146,	459 },
-	// ==================================
-	{ 44,	-1,	kVerbLook,		172,	428 },
-	// ==================================
-	{ 49,	-1,	kVerbLook,		 51,	132 },
-	// ----------------------------------
-	{ 49,	-1,	kVerbLook,		200,	133 },
-	{ 49,	-1,	kVerbTalk,		200,	134 },
-	// ----------------------------------
-	{ 49,	-1,	kVerbLook,		201,	135 },
-	// ----------------------------------
-	{ 49,	-1,	kVerbLook,		203,	137 },
-	// ==================================
-	{ 53,	-1,	kVerbLook,		121,	128 },
-	// ----------------------------------
-	{ 53,	-1,	kVerbLook,		209,	129 },
-	// ----------------------------------
-	{ 53,	-1,	kVerbLook,		 52,	447 },
-	{ 53,	-1,	kVerbTalk,		 52,	131 },
-	// ==================================
-	{ 54,	-1,	kVerbLook,		 53,	127 },
-	// ----------------------------------
-	{ 54,	-1,	kVerbOpen,		119,	125 },
-	{ 54,	-1,	kVerbLook,		119,	126 },
-	// ==================================
-	{ 55,	-1,	kVerbLook,		122,	138 },
-	// ----------------------------------
-	{ 55,	-1,	kVerbLook,		204,	139 },
-	// ----------------------------------
-	{ 55,	-1,	kVerbLook,		205,	140 },
-	// ==================================
-	{ 56,	-1,	kVerbLook,		124,	450 },
-	// ----------------------------------
-	{ 56,	-1,	kVerbOpen,		207,	141 },
-	// ----------------------------------
-	{ 56,	-1,	kVerbLook,		208,	142 },
-	// ==================================
-	{ 58,	-1,	kVerbLook,		104,	454 },
-	// ==================================
-	{ 60,	-1,	kVerbLook,		112,	440 },
-	// ----------------------------------
-	{ 60,	-1,	kVerbTalk,		115,	455 },
-	// ----------------------------------
-	{ 60,	-1,	kVerbTalk,		 56,	455 },
-	// ----------------------------------
-	{ 60,	-1,	kVerbLook,		114,	167 },
-	// ----------------------------------
-	{ 60,	-1,	kVerbLook,		113,	168 },
-	{ 60,	-1,	kVerbPick,		113,	170 },
-	{ 60,	-1,	kVerbMove,		113,	170 },
-	{ 60,	-1,	kVerbTalk,		113,	169 },
-	// ==================================
-	{ 61,	-1,	kVerbLook,		116,	172 },
-	// ----------------------------------
-	{ 61,	-1,	kVerbLook,		117,	173 },
-	// ----------------------------------
-	{ 61,	-1,	kVerbMove,		117,	174 },
-	{ 61,	-1,	kVerbOpen,		117,	174 },
-	{ 62,	-1,	kVerbLook,		100,	168 },
-	{ 62,	-1,	kVerbTalk,		100,	169 },
-	{ 62,	-1,	kVerbPick,		100,	170 },
-	// ----------------------------------
-	{ 62,	-1,	kVerbLook,		101,	171 },
-	// ----------------------------------
-	{ 62,	-1,	kVerbLook,		102,	167 },
-	// ----------------------------------
-	{ 62,	-1,	kVerbLook,		103,	166 },
-	// ==================================
-	{ 63,	-1,	kVerbLook,		110,	172 },
-	// ----------------------------------
-	{ 63,	-1,	kVerbLook,		109,	173 },
-	{ 63,	-1,	kVerbMove,		109,	174 },
-	// ----------------------------------
-	{ 63,	-1,	kVerbLook,		108,	334 },
-	{ 63,	-1,	kVerbTalk,		108,	333 },
-	// ==================================
-	{ 102,	-1,	kVerbLook,		100,	452 },
-	{ 102,	-1,	kVerbLook,		101,	123 },
-	{ 102,	-1,	kVerbPick,		-1,		453 },
-	{ 102,	-1,	kVerbOpen,		-1,		453 },
-	// ==================================
-	// Pseudoroom. checkAction() menuScreen == 1
-	{ 200,	1,	kVerbLook,		28,		328 },
-	// ----------------------------------
-	{ 200,	2,	kVerbLook,		28,		328 },
-	{ 200,	2,	kVerbLook,		7,		143 },
-	{ 200,	2,	kVerbLook,		8,		145 },
-	{ 200,	2,	kVerbLook,		9,		147 },
-	{ 200,	2,	kVerbLook,		10,		151 },
-	{ 200,	2,	kVerbLook,		11,		152 },
-	{ 200,	2,	kVerbLook,		12,		154 },
-	{ 200,	2,	kVerbLook,		13,		155 },
-	{ 200,	2,	kVerbLook,		14,		157 },
-	{ 200,	2,	kVerbLook,		15,		58 },
-	{ 200,	2,	kVerbLook,		16,		158 },
-	{ 200,	2,	kVerbLook,		17,		159 },
-	{ 200,	2,	kVerbLook,		18,		160 },
-	{ 200,	2,	kVerbLook,		19,		161 },
-	{ 200,	2,	kVerbLook,		23,		152 },
-	{ 200,	2,	kVerbTalk,		7,		144 },
-	{ 200,	2,	kVerbTalk,		8,		146 },
-	{ 200,	2,	kVerbTalk,		9,		148 },
-	{ 200,	2,	kVerbTalk,		11,		153 },
-	// ----------------------------------
-	{ 200,	3,	kVerbLook,		22,		307 },
-	{ 200,	3,	kVerbLook,		28,		328 },
-	{ 200,	3,	kVerbLook,		7,		143 },
-	{ 200,	3,	kVerbLook,		8,		145 },
-	{ 200,	3,	kVerbLook,		9,		147 },
-	{ 200,	3,	kVerbLook,		10,		151 },
-	{ 200,	3,	kVerbLook,		11,		152 },
-	{ 200,	3,	kVerbLook,		12,		154 },
-	{ 200,	3,	kVerbLook,		13,		155 },
-	{ 200,	3,	kVerbLook,		14,		157 },
-	{ 200,	3,	kVerbLook,		15,		58 },
-	{ 200,	3,	kVerbLook,		16,		158 },
-	{ 200,	3,	kVerbLook,		17,		159 },
-	{ 200,	3,	kVerbLook,		18,		160 },
-	{ 200,	3,	kVerbLook,		19,		161 },
-	{ 200,	3,	kVerbLook,		20,		162 },
-	{ 200,	3,	kVerbLook,		23,		152 },
-	{ 200,	3,	kVerbTalk,		7,		144 },
-	{ 200,	3,	kVerbTalk,		8,		146 },
-	{ 200,	3,	kVerbTalk,		9,		148 },
-	{ 200,	3,	kVerbTalk,		11,		153 },
-	// ----------------------------------
-	{ 200,	4,	kVerbLook,		7,		478 },
-	{ 200,	4,	kVerbLook,		8,		480 },
-	{ 200,	4,	kVerbLook,		10,		485 },
-	{ 200,	4,	kVerbLook,		11,		488 },
-	{ 200,	4,	kVerbLook,		12,		486 },
-	{ 200,	4,	kVerbLook,		13,		490 },
-	{ 200,	4,	kVerbLook,		14,		122 },
-	{ 200,	4,	kVerbLook,		15,		117 },
-	{ 200,	4,	kVerbLook,		16,		491 },
-	{ 200,	4,	kVerbLook,		17,		478 },
-	{ 200,	4,	kVerbLook,		18,		493 },
-	{ 200,	4,	kVerbLook,		20,		162 },
-	{ 200,	4,	kVerbLook,		21,		496 },
-	{ 200,	4,	kVerbLook,		22,		161 },
-	{ 200,	4,	kVerbLook,		28,		328 },
-	{ 200,	4,	kVerbTalk,		15,		118 },
-	{ 200,	4,	kVerbOpen,		15,		119 },
-	{ 200,	4,		   14,		19,		484 },
-	{ 200,	4,		   19,		14,		484 },
-	// ----------------------------------
-	{ 200,	5,	kVerbLook,		7,		478 },
-	{ 200,	5,	kVerbLook,		8,		120 },
-	{ 200,	5,	kVerbLook,		11,		488 },
-	{ 200,	5,	kVerbLook,		13,		490 },
-	{ 200,	5,	kVerbLook,		14,		121 },
-	{ 200,	5,	kVerbLook,		15,		117 },
-	{ 200,	5,	kVerbLook,		17,		478 },
-	{ 200,	5,	kVerbLook,		20,		162 },
-	{ 200,	5,	kVerbLook,		28,		328 },
-	{ 200,	5,	kVerbTalk,		15,		118 },
-	{ 200,	5,	kVerbOpen,		15,		119 },
-	// ----------------------------------
-	{ 200,	6,	kVerbLook,		20,		123 },
-	{ 200,	6,	kVerbLook,		21,		441 },
-	{ 200,	6,	kVerbLook,		28,		328 },
-	// ==================================
-	// Pseudoroom. checkAction() menuScreen != 1
-	{ 201,	1,	kVerbLook,		50,		308 },
-	{ 201,	1,	kVerbOpen,		50,		310 },
-	{ 201,	1,	kVerbClose,		50,		311 },
-	{ 201,	1,	kVerbMove,		50,		312 },
-	{ 201,	1,	kVerbPick,		50,		313 },
-	{ 201,	1,	kVerbTalk,		50,		314 },
-	// ----------------------------------
-	{ 201,	2,	kVerbLook,		50,		308 },
-	{ 201,	2,	kVerbOpen,		50,		310 },
-	{ 201,	2,	kVerbClose,		50,		311 },
-	{ 201,	2,	kVerbMove,		50,		312 },
-	{ 201,	2,	kVerbPick,		50,		313 },
-	{ 201,	2,	kVerbTalk,		50,		314 },
-	{ 201,	2,		   13,		50,		156 },
-	{ 201,	2,		   20,		50,		163 },
-	// ----------------------------------
-	{ 201,	3,	kVerbLook,		50,		309 },
-	{ 201,	3,	kVerbOpen,		50,		310 },
-	{ 201,	3,	kVerbClose,		50,		311 },
-	{ 201,	3,	kVerbMove,		50,		312 },
-	{ 201,	3,	kVerbPick,		50,		313 },
-	{ 201,	3,	kVerbTalk,		50,		314 },
-	// ----------------------------------
-	{ 201,	4,	kVerbLook,		50,		309 },
-	{ 201,	4,	kVerbOpen,		50,		310 },
-	{ 201,	4,	kVerbClose,		50,		311 },
-	{ 201,	4,	kVerbMove,		50,		312 },
-	{ 201,	4,	kVerbPick,		50,		313 },
-	{ 201,	4,	kVerbTalk,		50,		314 },
-	{ 201,	4,		    9,		50,		484 },
-	{ 201,	4,		   20,		50,		487 },
-	// ----------------------------------
-	{ 201,	5,	kVerbLook,		50,		309 }, // Originally these are with
-	{ 201,	5,	kVerbOpen,		50,		310 }, // completely wrong voices
-	{ 201,	5,	kVerbClose,		50,		311 },
-	{ 201,	5,	kVerbMove,		50,		312 },
-	{ 201,	5,	kVerbPick,		50,		313 },
-	{ 201,	5,	kVerbTalk,		50,		314 },
-	{ 201,	5,		   20,		50,		487 },
-	// ----------------------------------
-	{ 201,	6,	kVerbOpen,		50,		310 },
-	{ 201,	6,	kVerbClose,		50,		311 },
-	{ 201,	6,	kVerbMove,		50,		312 },
-	{ 201,	6,	kVerbPick,		50,		313 },
-	{ 201,	6,	kVerbTalk,		50,		314 },
-
-};
-
-} // End of namespace Drascula
-
-#endif /* STATICDATA_H */


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