Simplified the room preupdaters and updaters

svn-id: r32573

1 files changed, 93 insertions, 7 deletions

diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h
index 58bf24f75d..5fb404f4e1 100644
--- a/engines/drascula/staticdata.h
+++ b/engines/drascula/staticdata.h
@@ -106,12 +106,12 @@ const ItemLocation itemLocations[] = {
 	{ 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,
+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,
@@ -122,9 +122,95 @@ const int x1d_menu[] = {280, 40, 80, 120, 160, 200, 240, 0, 40, 80, 120,
 						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 frame_x[20] = {43, 87, 130, 173, 216, 259};
+int frame_x[20]		 = {43, 87, 130, 173, 216, 259};
 
 
+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[] = {