STARTREK: Start reading text from RDF files, instead of hardcoding it

Rooms DEMON0 and DEMON5 have been partially adapted to the new logic.

This isn't yet fully functional, for the following reasons:
- We only read the main text block. There are also some others which
are not handled yet. The unhandled blocks have been kept in text.cpp
- We load text in dictionaries, splitting the strings in look and talk.
However, there's a third category (look with a talker), which isn't
handled yet
- Text is loaded per-room, but there are enhancements where text and
samples are loaded from other rooms. These need to be refactored

1 files changed, 98 insertions, 97 deletions

diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index 1d19c5551c..a9204153e2 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -64,8 +64,9 @@ enum GroundTextIDs {
 // Text that's hardcoded into "RDF" files, and copied into here for a sane referencing
 // scheme.
 enum GameStringIDs {
-	TX_NULL,
-	TX_BLANK,
+	TX_BLANK = -1,
+	TX_NULL = 0,
+	TX_BLANK_OLD = 1,	// unused, kept as filler
 	TX_DIALOG_ERROR,
 	TX_ANIMATION_ERROR,
 
@@ -156,61 +157,61 @@ enum GameStringIDs {
 	TX_COMPU193,
 
 
-	TX_DEM0_001,
-	TX_DEM0_002,
-	TX_DEM0_003,
-	TX_DEM0_004,
-	TX_DEM0_005,
-	TX_DEM0_006,
-	TX_DEM0_007,
-	TX_DEM0_008,
-	TX_DEM0_009,
-	TX_DEM0_010,
-	TX_DEM0_011,
-	TX_DEM0_012,
+	TX_DEM0_001_REMOVED,
+	TX_DEM0_002_REMOVED,
+	TX_DEM0_003_REMOVED,
+	TX_DEM0_004_REMOVED,
+	TX_DEM0_005_REMOVED,
+	TX_DEM0_006_REMOVED,
+	TX_DEM0_007_REMOVED,
+	TX_DEM0_008_REMOVED,
+	TX_DEM0_009_REMOVED,
+	TX_DEM0_010_REMOVED,
+	TX_DEM0_011_REMOVED,
+	TX_DEM0_012_REMOVED,
 	TX_DEM0_013,
-	TX_DEM0_014,
+	TX_DEM0_014_REMOVED,
 	TX_DEM0_015,
 	TX_DEM0_016,
 	TX_DEM0_017,
-	TX_DEM0_018,
-	TX_DEM0_019,
-	TX_DEM0_020,
-	TX_DEM0_021,
-	TX_DEM0_022,
-	TX_DEM0_023,
-	TX_DEM0_024,
-	TX_DEM0_025,
-	TX_DEM0_026,
-	TX_DEM0_027,
-	TX_DEM0_028,
-	TX_DEM0_029,
-	TX_DEM0_030,
-	TX_DEM0_031,
-	TX_DEM0_032,
-	TX_DEM0_033,
-	TX_DEM0_034,
-	TX_DEM0_035,
-	TX_DEM0_036,
-	TX_DEM0_037,
-	TX_DEM0_038,
+	TX_DEM0_018_REMOVED,
+	TX_DEM0_019_REMOVED,
+	TX_DEM0_020_REMOVED,
+	TX_DEM0_021_REMOVED,
+	TX_DEM0_022_REMOVED,
+	TX_DEM0_023_REMOVED,
+	TX_DEM0_024_REMOVED,
+	TX_DEM0_025_REMOVED,
+	TX_DEM0_026_REMOVED,
+	TX_DEM0_027_REMOVED,
+	TX_DEM0_028_REMOVED,
+	TX_DEM0_029_REMOVED,
+	TX_DEM0_030_REMOVED,
+	TX_DEM0_031_REMOVED,
+	TX_DEM0_032_REMOVED,
+	TX_DEM0_033_REMOVED,
+	TX_DEM0_034_REMOVED,
+	TX_DEM0_035_REMOVED,
+	TX_DEM0_036_REMOVED,
+	TX_DEM0_037_REMOVED,
+	TX_DEM0_038_REMOVED,
 	TX_DEM0_039,
 	TX_DEM0_040,
-	TX_DEM0_041,
-	TX_DEM0_042,
-	TX_DEM0_043,
-	TX_DEM0_044,
-	TX_DEM0N000,
-	TX_DEM0N001,
-	TX_DEM0N002,
-	TX_DEM0N003,
-	TX_DEM0N004,
-	TX_DEM0N005,
-	TX_DEM0N006,
-	TX_DEM0N007,
-	TX_DEM0N008,
-	TX_DEM0N009,
-	TX_DEM0N010,
+	TX_DEM0_041_REMOVED,
+	TX_DEM0_042_REMOVED,
+	TX_DEM0_043_REMOVED,
+	TX_DEM0_044_REMOVED,
+	TX_DEM0N000_REMOVED,
+	TX_DEM0N001_REMOVED,
+	TX_DEM0N002_REMOVED,
+	TX_DEM0N003_REMOVED,
+	TX_DEM0N004_REMOVED,
+	TX_DEM0N005_REMOVED,
+	TX_DEM0N006_REMOVED,
+	TX_DEM0N007_REMOVED,
+	TX_DEM0N008_REMOVED,
+	TX_DEM0N009,	// kept because it's also used as an enhancement in mudd1
+	TX_DEM0N010_REMOVED,
 	TX_DEM0C001, // "C" = "Custom" (no ID originally assigned)
 
 
@@ -425,37 +426,37 @@ enum GameStringIDs {
 	TX_DEM4N014,
 
 
-	TX_DEM5_001,
-	TX_DEM5_002,
-	TX_DEM5_003,
-	TX_DEM5_004,
-	TX_DEM5_005,
+	TX_DEM5_001_REMOVED,
+	TX_DEM5_002_REMOVED,
+	TX_DEM5_003_REMOVED,
+	TX_DEM5_004_REMOVED,
+	TX_DEM5_005_REMOVED,
 	TX_DEM5_006,
 	TX_DEM5_007,
 	TX_DEM5_008,
 	TX_DEM5_009,
 	TX_DEM5_010,
-	TX_DEM5_011,
-	TX_DEM5_012,
-	TX_DEM5_013,
-	TX_DEM5_014,
-	TX_DEM5_015,
-	TX_DEM5_016,
-	TX_DEM5_017,
-	TX_DEM5_018,
-	TX_DEM5_019,
-	TX_DEM5_020,
-	TX_DEM5_021,
-	TX_DEM5_022,
-	TX_DEM5_023,
-	TX_DEM5_024,
-	TX_DEM5_025,
-	TX_DEM5_026,
-	TX_DEM5_027,
-	TX_DEM5_028,
-	TX_DEM5_029,
-	TX_DEM5_030,
-	TX_DEM5_031,
+	TX_DEM5_011_REMOVED,
+	TX_DEM5_012_REMOVED,
+	TX_DEM5_013_REMOVED,
+	TX_DEM5_014_REMOVED,
+	TX_DEM5_015_REMOVED,
+	TX_DEM5_016_REMOVED,
+	TX_DEM5_017_REMOVED,
+	TX_DEM5_018_REMOVED,
+	TX_DEM5_019_REMOVED,
+	TX_DEM5_020_REMOVED,
+	TX_DEM5_021_REMOVED,
+	TX_DEM5_022_REMOVED,
+	TX_DEM5_023_REMOVED,
+	TX_DEM5_024_REMOVED,
+	TX_DEM5_025_REMOVED,
+	TX_DEM5_026_REMOVED,
+	TX_DEM5_027_REMOVED,
+	TX_DEM5_028_REMOVED,
+	TX_DEM5_029_REMOVED,
+	TX_DEM5_030_REMOVED,
+	TX_DEM5_031_REMOVED,
 	TX_DEM5_032,
 	TX_DEM5_033,
 	TX_DEM5_034,
@@ -464,27 +465,27 @@ enum GameStringIDs {
 	TX_DEM5_037,
 	TX_DEM5_038,
 	TX_DEM5_039,
-	TX_DEM5_040,
-	TX_DEM5_041,
-	TX_DEM5_042,
-	TX_DEM5_043,
-	TX_DEM5_044,
-	TX_DEM5_045,
+	TX_DEM5_040_REMOVED,
+	TX_DEM5_041_REMOVED,
+	TX_DEM5_042_REMOVED,
+	TX_DEM5_043_REMOVED,
+	TX_DEM5_044_REMOVED,
+	TX_DEM5_045_REMOVED,
 	TX_DEM5L027,
-	TX_DEM5L028,
-	TX_DEM5L029,
-	TX_DEM5L030,
-	TX_DEM5L031,
-	TX_DEM5N000,
-	TX_DEM5N001,
-	TX_DEM5N002,
-	TX_DEM5N003,
-	TX_DEM5N004,
-	TX_DEM5N005,
-	TX_DEM5N006,
-	TX_DEM5N007,
-	TX_DEM5N008,
-	TX_DEM5N009,
+	TX_DEM5L028,	// name clash (L and _)
+	TX_DEM5L029,	// name clash (L and _)
+	TX_DEM5L030,	// name clash (L and _)
+	TX_DEM5L031,	// name clash (L and _)
+	TX_DEM5N000_REMOVED,
+	TX_DEM5N001_REMOVED,
+	TX_DEM5N002_REMOVED,
+	TX_DEM5N003_REMOVED,
+	TX_DEM5N004_REMOVED,
+	TX_DEM5N005_REMOVED,
+	TX_DEM5N006_REMOVED,
+	TX_DEM5N007_REMOVED,
+	TX_DEM5N008_REMOVED,
+	TX_DEM5N009_REMOVED,
 	TX_DEM5N010,
 	TX_DEM5N011,
 	TX_DEM5N012,