Merged all roomXXActions into single array. Thus simplified room parsers.

svn-id: r32559

1 files changed, 225 insertions, 323 deletions

diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h
index df4ad18556..fb3d966ec3 100644
--- a/engines/drascula/staticdata.h
+++ b/engines/drascula/staticdata.h
@@ -127,395 +127,297 @@ int frame_x[20] = {43, 87, 130, 173, 216, 259};
 
 // Note: default action needs to be LAST for each group
 // of actions with the same number
-RoomTalkAction room0Actions[] = {
-	// num	action			object	speech
-	{ 1,	kVerbLook,		-1,		 54 },
-	{ 1,	kVerbMove,		-1,		 19 },
-	{ 1,	kVerbPick,		-1,		 11 },
-	{ 1,	kVerbOpen,		-1,		  9 },
-	{ 1,	kVerbClose,		-1,		  9 },
-	{ 1,	kVerbTalk,		-1,		 16 },
-	{ 1,	kVerbDefault,	-1,		 11 },
+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 },
 	// ----------------------------------
-	{ 2,	kVerbMove,		-1,		 19 },
-	{ 2,	kVerbOpen,		-1,		  9 },
-	{ 2,	kVerbClose,		-1,		  9 },
-	{ 2,	kVerbTalk,		-1,		 16 },
+	{ 0,	2,	kVerbMove,		-1,		 19 },
+	{ 0,	2,	kVerbOpen,		-1,		  9 },
+	{ 0,	2,	kVerbClose,		-1,		  9 },
+	{ 0,	2,	kVerbTalk,		-1,		 16 },
 	// ----------------------------------
-	{ 3,	kVerbLook,		-1,		316 },
-	{ 3,	kVerbMove,		-1,		317 },
-	{ 3,	kVerbPick,		-1,		318 },
-	{ 3,	kVerbOpen,		-1,		319 },
-	{ 3,	kVerbClose,		-1,		319 },
-	{ 3,	kVerbTalk,		-1,		320 },
-	{ 3,	kVerbDefault,	-1,		318 },
+	{ 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 },
 	// ----------------------------------
-	{ 4,	kVerbMove,		-1,		 19 },
-	{ 4,	kVerbOpen,		-1,		  9 },
-	{ 4,	kVerbClose,		-1,		  9 },
-	{ 4,	kVerbTalk,		-1,		 16 },
+	{ 0,	4,	kVerbMove,		-1,		 19 },
+	{ 0,	4,	kVerbOpen,		-1,		  9 },
+	{ 0,	4,	kVerbClose,		-1,		  9 },
+	{ 0,	4,	kVerbTalk,		-1,		 16 },
 	// ----------------------------------
-	{ 5,	kVerbOpen,		-1,		  9 },
-	{ 5,	kVerbClose,		-1,		  9 },
-	{ 5,	kVerbTalk,		-1,		 16 },
+	{ 0,	5,	kVerbOpen,		-1,		  9 },
+	{ 0,	5,	kVerbClose,		-1,		  9 },
+	{ 0,	5,	kVerbTalk,		-1,		 16 },
 	// ----------------------------------
-	{ 6,	kVerbMove,		-1,		 19 },
-	{ 6,	kVerbOpen,		-1,		  9 },
-	{ 6,	kVerbClose,		-1,		  9 },
-	{ 6,	kVerbTalk,		-1,		 16 }
-};
-
-RoomTalkAction room1Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbPick,		118,	  5 },
-	{ -1,	kVerbOpen,		118,	  3 },
-	{ -1,	kVerbClose,		118,	  4 },
-	{ -1,	kVerbTalk,		118,	  6 },
+	{ 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,	kVerbLook,		119,	  8 },
-	{ -1,	kVerbMove,		119,	 13 },
-	{ -1,	kVerbClose,		119,	 10 },
-	{ -1,	kVerbTalk,		119,	 12 },
+	{ 1,	-1,	kVerbLook,		119,	  8 },
+	{ 1,	-1,	kVerbMove,		119,	 13 },
+	{ 1,	-1,	kVerbClose,		119,	 10 },
+	{ 1,	-1,	kVerbTalk,		119,	 12 },
 	// ----------------------------------
-	{ -1,	kVerbMove,		120,	 13 },
-	{ -1,	kVerbOpen,		120,	 18 },
-	{ -1,	kVerbTalk,		120,	 15 }
-};
-
-RoomTalkAction room3Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		129,	 21 },
-	{ -1,	kVerbPick,		129,	  5 },
-	{ -1,	kVerbMove,		129,	 24 },
-	{ -1,	kVerbOpen,		129,	 22 },
-	{ -1,	kVerbClose,		129,	 10 },
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		131,	 27 },
-	{ -1,	kVerbPick,		131,	  5 },
-	{ -1,	kVerbMove,		131,	 24 },
-	{ -1,	kVerbOpen,		131,	 22 },
-	{ -1,	kVerbClose,		131,	 10 },
-	{ -1,	kVerbTalk,		131,	 23 },
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		132,	 28 },
-	{ -1,	kVerbPick,		132,	  5 },
-	{ -1,	kVerbMove,		132,	 24 },
-	{ -1,	kVerbOpen,		132,	 22 },
-	{ -1,	kVerbClose,		132,	 10 },
-	{ -1,	kVerbTalk,		132,	 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		133,	321 },
-	{ -1,	kVerbPick,		133,	 31 },
-	{ -1,	kVerbMove,		133,	 34 },
-	{ -1,	kVerbOpen,		133,	 30 },
-	{ -1,	kVerbClose,		133,	 10 },
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		166,	 55 },
-	{ -1,	kVerbPick,		166,	  7 },
+	{ 3,	-1,	kVerbLook,		166,	 55 },
+	{ 3,	-1,	kVerbPick,		166,	  7 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		211,	184 }
-};
-
-RoomTalkAction room4Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		189,	182 },
+	{ 3,	-1,	kVerbLook,		211,	184 },
+	// ==================================
+	{ 4,	-1,	kVerbLook,		189,	182 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		207,	175 },
-	{ -1,	kVerbTalk,		207,	176 },
+	{ 4,	-1,	kVerbLook,		207,	175 },
+	{ 4,	-1,	kVerbTalk,		207,	176 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		208,	177 },
+	{ 4,	-1,	kVerbLook,		208,	177 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		209,	179 },
+	{ 4,	-1,	kVerbLook,		209,	179 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		210,	180 },
-	{ -1,	kVerbOpen,		210,	181 }
-};
-
-RoomTalkAction room5Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbMove,		136,	 13 },
-	{ -1,	kVerbOpen,		136,	 18 },
-	{ -1,	kVerbTalk,		136,	 15 },
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		212,	187 },
-	{ -1,	kVerbTalk,		212,	188 },
+	{ 5,	-1,	kVerbLook,		212,	187 },
+	{ 5,	-1,	kVerbTalk,		212,	188 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		213,	189 },
-	{ -1,	kVerbOpen,		213,	190 }
-};
-
-RoomTalkAction room6Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbPick,		144,	 43 },
+	{ 5,	-1,	kVerbLook,		213,	189 },
+	{ 5,	-1,	kVerbOpen,		213,	190 },
+	// ==================================
+	{ 6,	-1,	kVerbPick,		144,	 43 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		138,	 35 },
-	{ -1,	kVerbTalk,		138,	  6 },
+	{ 6,	-1,	kVerbLook,		138,	 35 },
+	{ 6,	-1,	kVerbTalk,		138,	  6 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		143,	 37 },
-	{ -1,	kVerbPick,		143,	  7 },
-	{ -1,	kVerbMove,		143,	  7 },
-	{ -1,	kVerbTalk,		143,	 38 },
+	{ 6,	-1,	kVerbLook,		143,	 37 },
+	{ 6,	-1,	kVerbPick,		143,	  7 },
+	{ 6,	-1,	kVerbMove,		143,	  7 },
+	{ 6,	-1,	kVerbTalk,		143,	 38 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		139,	 36 },
+	{ 6,	-1,	kVerbLook,		139,	 36 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		140,	147 }
-};
-
-RoomTalkAction room7Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		164,	 35 },
+	{ 6,	-1,	kVerbLook,		140,	147 },
+	// ==================================
+	{ 7,	-1,	kVerbLook,		164,	 35 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		169,	 44 }
-};
-
-RoomTalkAction room9Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		150,	 35 },
-	{ -1,	kVerbTalk,		150,	  6 },
+	{ 7,	-1,	kVerbLook,		169,	 44 },
+	// ==================================
+	{ 9,	-1,	kVerbLook,		150,	 35 },
+	{ 9,	-1,	kVerbTalk,		150,	  6 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		 51,	 60 },
-};
-
-RoomTalkAction room12Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		154,	329 },
-	{ -1,	kVerbTalk,		154,	330 },
+	{ 9,	-1,	kVerbLook,		 51,	 60 },
+	// ==================================
+	{ 12,	-1,	kVerbLook,		154,	329 },
+	{ 12,	-1,	kVerbTalk,		154,	330 },
 	// ----------------------------------
-	{ -1,	kVerbMove,		155,	 48 },
-	{ -1,	kVerbTalk,		155,	331 },
+	{ 12,	-1,	kVerbMove,		155,	 48 },
+	{ 12,	-1,	kVerbTalk,		155,	331 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		156,	 35 },
-	{ -1,	kVerbMove,		156,	 48 },
-	{ -1,	kVerbTalk,		156,	 50 }
-};
-
-RoomTalkAction room14Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		200,	165 },
+	{ 12,	-1,	kVerbLook,		156,	 35 },
+	{ 12,	-1,	kVerbMove,		156,	 48 },
+	{ 12,	-1,	kVerbTalk,		156,	 50 },
+	// ==================================
+	{ 14,	-1,	kVerbLook,		200,	165 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		201,	166 },
+	{ 14,	-1,	kVerbLook,		201,	166 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		202,	167 },
+	{ 14,	-1,	kVerbLook,		202,	167 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		203,	168 },
-	{ -1,	kVerbPick,		203,	170 },
-	{ -1,	kVerbMove,		203,	170 },
-	{ -1,	kVerbTalk,		203,	169 },
+	{ 14,	-1,	kVerbLook,		203,	168 },
+	{ 14,	-1,	kVerbPick,		203,	170 },
+	{ 14,	-1,	kVerbMove,		203,	170 },
+	{ 14,	-1,	kVerbTalk,		203,	169 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		204,	171 }
-};
-
-RoomTalkAction room15Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbTalk,		188,	333 },
-	{ -1,	kVerbLook,		188,	334 },
+	{ 14,	-1,	kVerbLook,		204,	171 },
+	// ==================================
+	{ 15,	-1,	kVerbTalk,		188,	333 },
+	{ 15,	-1,	kVerbLook,		188,	334 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		205,	172 },
+	{ 15,	-1,	kVerbLook,		205,	172 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		206,	173 },
-	{ -1,	kVerbMove,		206,	174 },
-	{ -1,	kVerbOpen,		206,	174 }
-};
-
-RoomTalkAction room16Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbTalk,		163,	  6 },
+	{ 15,	-1,	kVerbLook,		206,	173 },
+	{ 15,	-1,	kVerbMove,		206,	174 },
+	{ 15,	-1,	kVerbOpen,		206,	174 },
+	// ==================================
+	{ 16,	-1,	kVerbTalk,		163,	  6 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		183,	340 },
+	{ 16,	-1,	kVerbLook,		183,	340 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		185,	 37 },
-	{ -1,	kVerbPick,		185,	  7 },
-	{ -1,	kVerbMove,		185,	  7 },
-	{ -1,	kVerbTalk,		185,	 38 },
+	{ 16,	-1,	kVerbLook,		185,	 37 },
+	{ 16,	-1,	kVerbPick,		185,	  7 },
+	{ 16,	-1,	kVerbMove,		185,	  7 },
+	{ 16,	-1,	kVerbTalk,		185,	 38 },
 	// ----------------------------------
-	{ -1,	kVerbTalk,		187,	345 }
-};
-
-RoomTalkAction room18Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		181,	348 },
+	{ 16,	-1,	kVerbTalk,		187,	345 },
+	// ==================================
+	{ 18,	-1,	kVerbLook,		181,	348 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		182,	154 }
-};
-
-RoomTalkAction room19Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		214,	191 }
-};
-
-RoomTalkAction room22Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbPick,		140,	  7 },
+	{ 18,	-1,	kVerbLook,		182,	154 },
+	// ==================================
+	{ 19,	-1,	kVerbLook,		214,	191 },
+	// ==================================
+	{ 22,	-1,	kVerbPick,		140,	  7 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		 52,	497 },
-	{ -1,	kVerbTalk,		 52,	498 }
-};
-
-RoomTalkAction room24Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		151,	461 }
-};
-
-RoomTalkAction room26Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbOpen,		167,	467 },
+	{ 22,	-1,	kVerbLook,		 52,	497 },
+	{ 22,	-1,	kVerbTalk,		 52,	498 },
+	// ==================================
+	{ 24,	-1,	kVerbLook,		151,	461 },
+	// ==================================
+	{ 26,	-1,	kVerbOpen,		167,	467 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		164,	470 },
-	{ -1,	kVerbOpen,		164,	471 },
+	{ 26,	-1,	kVerbLook,		164,	470 },
+	{ 26,	-1,	kVerbOpen,		164,	471 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		163,	472 },
-	{ -1,	kVerbPick,		163,	473 },
+	{ 26,	-1,	kVerbLook,		163,	472 },
+	{ 26,	-1,	kVerbPick,		163,	473 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		165,	474 },
+	{ 26,	-1,	kVerbLook,		165,	474 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		168,	476 },
-	{ -1,	kVerbPick,		168,	477 }
-};
-
-RoomTalkAction room29Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		152,	463 },
-	{ -1,	kVerbOpen,		152,	464 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		153,	465 },
+	{ 26,	-1,	kVerbLook,		168,	476 },
+	{ 26,	-1,	kVerbPick,		168,	477 },
+	// ==================================
+	{ 29,	-1,	kVerbLook,		152,	463 },
+	{ 29,	-1,	kVerbOpen,		152,	464 },
 	// ----------------------------------
-	{ -1,	kVerbPick,		154,	466 },
+	{ 29,	-1,	kVerbLook,		153,	465 },
 	// ----------------------------------
-	{ -1,	kVerbOpen,		156,	467 }
-};
-
-RoomTalkAction room30Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbOpen,		157,	468 },
+	{ 29,	-1,	kVerbPick,		154,	466 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		158,	469 }
-};
-
-RoomTalkAction room31Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		161,	470 },
-	{ -1,	kVerbOpen,		161,	471 }
-};
-
-RoomTalkAction room34Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		146,	458 },
-	{ -1,	kVerbPick,		146,	459 }
-};
-
-RoomTalkAction room44Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		172,	428 }
-};
-
-RoomTalkAction room49Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		 51,	132 },
+	{ 29,	-1,	kVerbOpen,		156,	467 },
+	// ==================================
+	{ 30,	-1,	kVerbOpen,		157,	468 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		200,	133 },
-	{ -1,	kVerbTalk,		200,	134 },
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		201,	135 },
+	{ 49,	-1,	kVerbLook,		200,	133 },
+	{ 49,	-1,	kVerbTalk,		200,	134 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		203,	137 }
-};
-
-RoomTalkAction room53Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		121,	128 },
+	{ 49,	-1,	kVerbLook,		201,	135 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		209,	129 },
+	{ 49,	-1,	kVerbLook,		203,	137 },
+	// ==================================
+	{ 53,	-1,	kVerbLook,		121,	128 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		 52,	447 },
-	{ -1,	kVerbTalk,		 52,	131 }
-};
-
-RoomTalkAction room54Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		 53,	127 },
+	{ 53,	-1,	kVerbLook,		209,	129 },
 	// ----------------------------------
-	{ -1,	kVerbOpen,		119,	125 },
-	{ -1,	kVerbLook,		119,	126 }
-};
-
-RoomTalkAction room55Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		122,	138 },
+	{ 53,	-1,	kVerbLook,		 52,	447 },
+	{ 53,	-1,	kVerbTalk,		 52,	131 },
+	// ==================================
+	{ 54,	-1,	kVerbLook,		 53,	127 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		204,	139 },
+	{ 54,	-1,	kVerbOpen,		119,	125 },
+	{ 54,	-1,	kVerbLook,		119,	126 },
+	// ==================================
+	{ 55,	-1,	kVerbLook,		122,	138 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		205,	140 }
-};
-
-RoomTalkAction room56Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		124,	450 },
+	{ 55,	-1,	kVerbLook,		204,	139 },
 	// ----------------------------------
-	{ -1,	kVerbOpen,		207,	141 },
+	{ 55,	-1,	kVerbLook,		205,	140 },
+	// ==================================
+	{ 56,	-1,	kVerbLook,		124,	450 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		208,	142 }
-};
-
-RoomTalkAction room58Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		104,	454 }
-};
-
-RoomTalkAction room60Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		112,	440 },
+	{ 56,	-1,	kVerbOpen,		207,	141 },
 	// ----------------------------------
-	{ -1,	kVerbTalk,		115,	455 },
+	{ 56,	-1,	kVerbLook,		208,	142 },
+	// ==================================
+	{ 58,	-1,	kVerbLook,		104,	454 },
+	// ==================================
+	{ 60,	-1,	kVerbLook,		112,	440 },
 	// ----------------------------------
-	{ -1,	kVerbTalk,		 56,	455 },
+	{ 60,	-1,	kVerbTalk,		115,	455 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		114,	167 },
+	{ 60,	-1,	kVerbTalk,		 56,	455 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		113,	168 },
-	{ -1,	kVerbPick,		113,	170 },
-	{ -1,	kVerbMove,		113,	170 },
-	{ -1,	kVerbTalk,		113,	169 }
-};
-
-RoomTalkAction room61Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		116,	172 },
+	{ 60,	-1,	kVerbLook,		114,	167 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		117,	173 },
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbMove,		117,	174 },
-	{ -1,	kVerbOpen,		117,	174 },
-};
-
-RoomTalkAction room62Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		100,	168},
-	{ -1,	kVerbTalk,		100,	169},
-	{ -1,	kVerbPick,		100,	170},
+	{ 61,	-1,	kVerbLook,		117,	173 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		101,	171},
+	{ 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 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		102,	167},
+	{ 62,	-1,	kVerbLook,		101,	171 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		103,	166}
-};
-
-RoomTalkAction room63Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		110,	172},
+	{ 62,	-1,	kVerbLook,		102,	167 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		109,	173},
-	{ -1,	kVerbMove,		109,	174},
+	{ 62,	-1,	kVerbLook,		103,	166 },
+	// ==================================
+	{ 63,	-1,	kVerbLook,		110,	172 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		108,	334},
-	{ -1,	kVerbTalk,		108,	333}
-};
-
-RoomTalkAction room102Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		100,	452},
+	{ 63,	-1,	kVerbLook,		109,	173 },
+	{ 63,	-1,	kVerbMove,		109,	174 },
 	// ----------------------------------
-	{ -1,	kVerbLook,		101,	123}
+	{ 63,	-1,	kVerbLook,		108,	334 },
+	{ 63,	-1,	kVerbTalk,		108,	333 },
+	// ==================================
+	{ 102,	-1,	kVerbLook,		100,	452 },
+	{ 102,	-1,	kVerbLook,		101,	123 },
 };
 
 const char *_text[][501] = {