- Renamed texts.cpp to staticdata.h and moved all game static data there

- Simplified room_0()
- Some cleanup

svn-id: r32404

5 files changed, 237 insertions, 282 deletions

diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 1b381fc923..41d3af28e5 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -79,48 +79,6 @@ DrasculaEngine::~DrasculaEngine() {
 	delete _rnd;
 }
 
-struct ItemLocation {
-	int x;
-	int y;
-};
-
-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
-};
-
-static 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};
-static 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};
-static const int x_barra[] = {6, 51, 96, 141, 186, 232, 276, 321};
-static 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};
-static 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};
-static int frame_x[20] = {43, 87, 130, 173, 216, 259};
-
 int DrasculaEngine::init() {
 	// Initialize backend
 	_system->beginGFXTransaction();
@@ -694,10 +652,7 @@ bucles:
 			cont_sv = 0;
 	}
 
-	if (mouseY < 24 && menuScreen == 0)
-		menuBar = 1;
-	else
-		menuBar = 0;
+	menuBar = (mouseY < 24 && menuScreen == 0) ? 1 : 0;
 
 	Common::KeyCode key = getScan();
 	if (key == Common::KEYCODE_F1 && menuScreen == 0) {
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 8a907bcb7a..b5470bf492 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -93,7 +93,18 @@ enum SSNFrames {
 #define TEXTD_START 68
 
 struct DrasculaGameDescription;
-struct RoomTalkAction;
+
+struct RoomTalkAction {
+	int num;
+	int action;
+	int objectID;
+	int speechID;
+};
+
+struct ItemLocation {
+	int x;
+	int y;
+};
 
 #define NUM_SAVES     10
 #define NUM_FLAGS     50
@@ -743,6 +754,12 @@ extern const char *_textverbs[][6];
 extern const char *_textmisc[][2];
 extern const char *_textd1[][11];
 
+extern ItemLocation itemLocations[];
+extern int frame_x[20];
+extern const int x_pol[44], y_pol[44];
+extern const int x_barra[];
+extern const int x1d_menu[], y1d_menu[];
+
 } // End of namespace Drascula
 
 #endif /* DRASCULA_H */
diff --git a/engines/drascula/module.mk b/engines/drascula/module.mk
index 042b227ca3..2f72855af1 100644
--- a/engines/drascula/module.mk
+++ b/engines/drascula/module.mk
@@ -5,8 +5,7 @@ MODULE_OBJS = \
 	detection.o \
 	drascula.o \
 	rooms.o \
-	talk.o \
-	texts.o
+	talk.o
 
 
 # This module can be built as a plugin
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 00e377ac9f..d8a9964222 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -24,187 +24,10 @@
  */
 
 #include "drascula/drascula.h"
+#include "drascula/staticdata.h"
 
 namespace Drascula {
 
-static const int mirar_t[3] = {100, 101, 54};
-static const char mirar_v[3][14] = {"100.als", "101.als", "54.als"};
-static const int poder_t[6] = {11, 109, 111, 110, 115, 116};
-static const char poder_v[6][14] = {"11.als", "109.als", "111.als", "110.als", "115.als", "116.als"};
-
-struct RoomTalkAction {
-	int num;
-	int action;
-	int objectID;
-	int speechID;
-};
-
-// TODO: move these elsewhere, or in a .dat file?
-// 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 },
-	// ----------------------------------
-	{ 2,	kVerbMove,		-1,		 19 },
-	{ 2,	kVerbOpen,		-1,		  9 },
-	{ 2,	kVerbClose,		-1,		  9 },
-	{ 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 },
-	// ----------------------------------
-	{ 4,	kVerbMove,		-1,		 19 },
-	{ 4,	kVerbOpen,		-1,		  9 },
-	{ 4,	kVerbClose,		-1,		  9 },
-	{ 4,	kVerbTalk,		-1,		 16 },
-	// ----------------------------------
-	{ 5,	kVerbOpen,		-1,		  9 },
-	{ 5,	kVerbClose,		-1,		  9 },
-	{ 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 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		119,	  8 },
-	{ -1,	kVerbMove,		119,	 13 },
-	{ -1,	kVerbClose,		119,	 10 },
-	{ -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,	kVerbLook,		131,	 27 },
-	{ -1,	kVerbPick,		131,	  5 },
-	{ -1,	kVerbMove,		131,	 24 },
-	{ -1,	kVerbOpen,		131,	 22 },
-	{ -1,	kVerbClose,		131,	 10 },
-	{ -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 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		133,	321 },
-	{ -1,	kVerbPick,		133,	 31 },
-	{ -1,	kVerbMove,		133,	 34 },
-	{ -1,	kVerbOpen,		133,	 30 },
-	{ -1,	kVerbClose,		133,	 10 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		166,	 55 },
-	{ -1,	kVerbPick,		166,	  7 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		211,	184 }
-};
-
-RoomTalkAction room4Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		189,	182 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		207,	175 },
-	{ -1,	kVerbTalk,		207,	176 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		208,	177 },
-	// ----------------------------------
-	{ -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 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		212,	187 },
-	{ -1,	kVerbTalk,		212,	188 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		213,	189 },
-	{ -1,	kVerbOpen,		213,	190 }
-};
-
-RoomTalkAction room6Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbPick,		144,	 43 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		138,	 35 },
-	{ -1,	kVerbTalk,		138,	  6 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		143,	 37 },
-	{ -1,	kVerbPick,		143,	  7 },
-	{ -1,	kVerbMove,		143,	  7 },
-	{ -1,	kVerbTalk,		143,	 38 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		139,	 36 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		140,	147 }
-};
-
-RoomTalkAction room12Actions[] = {
-	// num	action			object	speech
-	{ -1,	kVerbLook,		154,	329 },
-	{ -1,	kVerbTalk,		154,	330 },
-	// ----------------------------------
-	{ -1,	kVerbMove,		155,	 48 },
-	{ -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 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		201,	166 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		202,	167 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		203,	168 },
-	{ -1,	kVerbPick,		203,	170 },
-	{ -1,	kVerbMove,		203,	170 },
-	{ -1,	kVerbTalk,		203,	169 },
-	// ----------------------------------
-	{ -1,	kVerbLook,		204,	171 }
-};
-
 bool DrasculaEngine::roomParse(RoomTalkAction* roomActions, int fl) {
 	bool didAction = false;
 
@@ -227,74 +50,27 @@ bool DrasculaEngine::roomParse(RoomTalkAction* roomActions, int fl) {
 }
 
 void DrasculaEngine::room_0() {
+	static const int mirar_t[3] = {100, 101, 54};
+	static const int poder_t[6] = {11, 109, 111, 110, 115, 116};
+
 	if (roomParse(room0Actions, -1))
 		return;
 
 	// non-default actions
-	if (num_ejec == 2) {
-		if (pickedObject == kVerbLook) {
-			talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
-			c_mirar++;
-			if (c_mirar == 3)
-				c_mirar = 0;
-		} else if (pickedObject == kVerbPick) {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
-		} else {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
-		}
-	} else if (num_ejec == 4) {
-		if (pickedObject == kVerbLook) {
-			talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
-			c_mirar++;
-			if (c_mirar == 3)
-				c_mirar = 0;
-		} else if (pickedObject == kVerbPick) {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
-		} else {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
-		}
-	} else if (num_ejec == 5) {
-		if (pickedObject == kVerbLook) {
-			talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
-			c_mirar++;
-			if (c_mirar == 3)
-				c_mirar = 0;
-		} else if (pickedObject == kVerbPick) {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
-		} else {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
-			c_poder++;
-			if (c_poder == 6)
-				c_poder = 0;
-		}
-	} else if (num_ejec == 6) {
+	if (num_ejec == 2 || num_ejec == 4 || 
+		num_ejec == 5 || num_ejec == 6) {
 		if (pickedObject == kVerbLook) {
-			talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
+			talk(mirar_t[c_mirar]);
 			c_mirar++;
 			if (c_mirar == 3)
 				c_mirar = 0;
 		} else if (pickedObject == kVerbPick) {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+			talk(poder_t[c_poder]);
 			c_poder++;
 			if (c_poder == 6)
 				c_poder = 0;
 		} else {
-			talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+			talk(poder_t[c_poder]);
 			c_poder++;
 			if (c_poder == 6)
 				c_poder = 0;
diff --git a/engines/drascula/texts.cpp b/engines/drascula/staticdata.h
index c84f176d35..937f3460b7 100644
--- a/engines/drascula/texts.cpp
+++ b/engines/drascula/staticdata.h
@@ -23,10 +23,216 @@
  *
  */
 
+#ifndef STATICDATA_H
+#define STATICDATA_H
+
 #include "drascula/drascula.h"
 
 namespace Drascula {
 
+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 x_barra[] = {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 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 },
+	// ----------------------------------
+	{ 2,	kVerbMove,		-1,		 19 },
+	{ 2,	kVerbOpen,		-1,		  9 },
+	{ 2,	kVerbClose,		-1,		  9 },
+	{ 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 },
+	// ----------------------------------
+	{ 4,	kVerbMove,		-1,		 19 },
+	{ 4,	kVerbOpen,		-1,		  9 },
+	{ 4,	kVerbClose,		-1,		  9 },
+	{ 4,	kVerbTalk,		-1,		 16 },
+	// ----------------------------------
+	{ 5,	kVerbOpen,		-1,		  9 },
+	{ 5,	kVerbClose,		-1,		  9 },
+	{ 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 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		119,	  8 },
+	{ -1,	kVerbMove,		119,	 13 },
+	{ -1,	kVerbClose,		119,	 10 },
+	{ -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,	kVerbLook,		131,	 27 },
+	{ -1,	kVerbPick,		131,	  5 },
+	{ -1,	kVerbMove,		131,	 24 },
+	{ -1,	kVerbOpen,		131,	 22 },
+	{ -1,	kVerbClose,		131,	 10 },
+	{ -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 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		133,	321 },
+	{ -1,	kVerbPick,		133,	 31 },
+	{ -1,	kVerbMove,		133,	 34 },
+	{ -1,	kVerbOpen,		133,	 30 },
+	{ -1,	kVerbClose,		133,	 10 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		166,	 55 },
+	{ -1,	kVerbPick,		166,	  7 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		211,	184 }
+};
+
+RoomTalkAction room4Actions[] = {
+	// num	action			object	speech
+	{ -1,	kVerbLook,		189,	182 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		207,	175 },
+	{ -1,	kVerbTalk,		207,	176 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		208,	177 },
+	// ----------------------------------
+	{ -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 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		212,	187 },
+	{ -1,	kVerbTalk,		212,	188 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		213,	189 },
+	{ -1,	kVerbOpen,		213,	190 }
+};
+
+RoomTalkAction room6Actions[] = {
+	// num	action			object	speech
+	{ -1,	kVerbPick,		144,	 43 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		138,	 35 },
+	{ -1,	kVerbTalk,		138,	  6 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		143,	 37 },
+	{ -1,	kVerbPick,		143,	  7 },
+	{ -1,	kVerbMove,		143,	  7 },
+	{ -1,	kVerbTalk,		143,	 38 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		139,	 36 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		140,	147 }
+};
+
+RoomTalkAction room12Actions[] = {
+	// num	action			object	speech
+	{ -1,	kVerbLook,		154,	329 },
+	{ -1,	kVerbTalk,		154,	330 },
+	// ----------------------------------
+	{ -1,	kVerbMove,		155,	 48 },
+	{ -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 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		201,	166 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		202,	167 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		203,	168 },
+	{ -1,	kVerbPick,		203,	170 },
+	{ -1,	kVerbMove,		203,	170 },
+	{ -1,	kVerbTalk,		203,	169 },
+	// ----------------------------------
+	{ -1,	kVerbLook,		204,	171 }
+};
+
 const char *_text[][501] = {
 {
 	// 0
@@ -5358,3 +5564,5 @@ const char *_textmisc[][2] = {
 };
 
 } // End of namespace Drascula
+
+#endif /* STATICDATA_H */