STARTREK: Load more messages from RDF files

The whole Demon chapter has been converted to the new logic.
The offsets for the extra room messages have been hardcoded, for now,
inside loadOtherRoomMessages(), until we figure out how they are
referenced.

1 files changed, 6 insertions, 411 deletions

diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index a9204153e2..02709345c4 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -156,421 +156,16 @@ enum GameStringIDs {
 	TX_COMPU192,
 	TX_COMPU193,
 
-
-	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_REMOVED,
-	TX_DEM0_015,
-	TX_DEM0_016,
-	TX_DEM0_017,
-	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_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)
-
-
-	TX_DEM1_001,
-	TX_DEM1_002,
-	TX_DEM1_003,
-	TX_DEM1_004,
-	TX_DEM1_005,
-	TX_DEM1_006,
-	TX_DEM1_007,
-	TX_DEM1_008,
-	TX_DEM1_009,
-	TX_DEM1_011,
-	TX_DEM1_012,
-	TX_DEM1_013,
-	TX_DEM1_014,
-	TX_DEM1_015,
-	TX_DEM1_016,
-	TX_DEM1_017,
-	TX_DEM1_018,
-	TX_DEM1_019,
-	TX_DEM1_020,
-	TX_DEM1_021,
-	TX_DEM1_022,
-	TX_DEM1_023,
-	TX_DEM1_024,
-	TX_DEM1_025,
-	TX_DEM1_026,
+	TX_DEM0C001,	// "C" = "Custom" (no ID originally assigned)
+
 	TX_DEM1_F23,
-	TX_DEM1N000,
-	TX_DEM1N001,
-	TX_DEM1N002,
-	TX_DEM1N003,
-	TX_DEM1N004,
-	TX_DEM1N005,
-	TX_DEM1N006,
-	TX_DEM1N007,
-	TX_DEM1N008,
-	TX_DEM1N009,
-	TX_DEM1N010,
-	TX_DEM1N011,
-	TX_DEM1N012,
-	TX_DEM1N013,
-	TX_DEM1N014,
-	TX_DEM1N015,
-	TX_DEM1N016,
-	TX_DEM1N017,
-	TX_DEM1N018,
-	TX_DEM1N019,
-	TX_DEM1N020,
-	TX_DEM1N021,
-	TX_DEM1N023,
-	TX_DEM1U077,
-	TX_DEM1U078,
-
-
-	TX_DEM2_001,
-	TX_DEM2_002,
-	TX_DEM2_003,
-	TX_DEM2_004,
-	TX_DEM2_005,
-	TX_DEM2_006,
-	TX_DEM2_007,
-	TX_DEM2_008,
-	TX_DEM2_009,
-	TX_DEM2_010,
-	TX_DEM2_011,
-	TX_DEM2_012,
-	TX_DEM2_013,
-	TX_DEM2_014,
-	TX_DEM2_015,
-	TX_DEM2_016,
-	TX_DEM2_017,
-	TX_DEM2_018,
-	TX_DEM2_019,
-	TX_DEM2_020,
-	TX_DEM2N000,
-	TX_DEM2N002,
-	TX_DEM2N003,
-	TX_DEM2N004,
-	TX_DEM2N005,
-	TX_DEM2N006,
-	TX_DEM2N007,
-	TX_DEM2N008,
-	TX_DEM2N009,
-	TX_DEM2N010,
-	TX_DEM2N011,
-	TX_DEM2N012,
-	TX_DEM2N013,
-
-
-	TX_DEM3_001,
-	TX_DEM3_002,
-	TX_DEM3_003,
-	TX_DEM3_004,
-	TX_DEM3_005,
-	TX_DEM3_006,
-	TX_DEM3_007,
-	TX_DEM3_008,
-	TX_DEM3_009,
-	TX_DEM3_010,
-	TX_DEM3_011,
-	TX_DEM3_012,
-	TX_DEM3_013,
-	TX_DEM3_014,
-	TX_DEM3_015,
-	TX_DEM3_016,
-	TX_DEM3_017,
-	TX_DEM3_018,
-	TX_DEM3_019,
-	TX_DEM3_020,
-	TX_DEM3_021,
-	TX_DEM3_022,
-	TX_DEM3_023,
-	TX_DEM3_024,
-	TX_DEM3_025,
-	TX_DEM3_026,
-	TX_DEM3_027,
-	TX_DEM3_028,
-	TX_DEM3_029,
-	TX_DEM3_030,
-	TX_DEM3_031,
-	TX_DEM3_033,
-	TX_DEM3_034,
-	TX_DEM3_035,
-	TX_DEM3_036,
+
+	TX_DEM3_019,	// kept because it's also used as an enhancement in venga
+
 	TX_DEM3_A32,
-	TX_DEM3_B32,
+	TX_DEM3_B32,	// unused?
 	TX_DEM3_F21,
-	TX_DEM3N000,
-	TX_DEM3N001,
-	TX_DEM3N002,
-	TX_DEM3N003,
-	TX_DEM3N004,
-	TX_DEM3N005,
-	TX_DEM3N006,
-	TX_DEM3N007,
-	TX_DEM3N008,
-	TX_DEM3N009,
-	TX_DEM3N010,
-	TX_DEM3N011,
-	TX_DEM3N012,
-	TX_DEM3N013,
-	TX_DEM3N014,
-	TX_DEM3N015,
-	TX_DEM3N016,
-	TX_DEM3N017,
-	TX_DEM3N018,
-	TX_DEM3N019,
-	TX_DEM3N020,
-
-
-	TX_DEM4_001,
-	TX_DEM4_002,
-	TX_DEM4_003,
-	TX_DEM4_004,
-	TX_DEM4_005,
-	TX_DEM4_006,
-	TX_DEM4_007,
-	TX_DEM4_008,
-	TX_DEM4_009,
-	TX_DEM4_010,
-	TX_DEM4_011,
-	TX_DEM4_012,
-	TX_DEM4_013,
-	TX_DEM4_014,
-	TX_DEM4_015,
-	TX_DEM4_017,
-	TX_DEM4_018,
-	TX_DEM4_019,
-	TX_DEM4_020,
-	TX_DEM4_021,
-	TX_DEM4_022,
-	TX_DEM4_023,
-	TX_DEM4_024,
-	TX_DEM4_025,
-	TX_DEM4_026,
-	TX_DEM4_027,
-	TX_DEM4_029,
-	TX_DEM4_030,
-	TX_DEM4_031,
-	TX_DEM4_032,
-	TX_DEM4_033,
-	TX_DEM4_034,
-	TX_DEM4_035,
-	TX_DEM4_036,
-	TX_DEM4_037,
-	TX_DEM4_038,
-	TX_DEM4_039,
-	TX_DEM4_040,
-	TX_DEM4_041,
-	TX_DEM4_042,
-	TX_DEM4_043,
-	TX_DEM4_044,
-	TX_DEM4_045,
-	TX_DEM4_046,
-	TX_DEM4_047,
-	TX_DEM4N000,
-	TX_DEM4N001,
-	TX_DEM4N002,
-	TX_DEM4N003,
-	TX_DEM4N004,
-	TX_DEM4N005,
-	TX_DEM4N006,
-	TX_DEM4N007,
-	TX_DEM4N008,
-	TX_DEM4N009,
-	TX_DEM4N010,
-	TX_DEM4N011,
-	TX_DEM4N012,
-	TX_DEM4N013,
-	TX_DEM4N014,
-
-
-	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_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,
-	TX_DEM5_035,
-	TX_DEM5_036,
-	TX_DEM5_037,
-	TX_DEM5_038,
-	TX_DEM5_039,
-	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,	// 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,
-	TX_DEM5N013,
-
-
-	TX_DEM6_001,
-	TX_DEM6_002,
-	TX_DEM6_003,
-	TX_DEM6_004,
-	TX_DEM6_005,
-	TX_DEM6_006,
-	TX_DEM6_007,
-	TX_DEM6_008,
-	TX_DEM6_009,
-	TX_DEM6_010,
-	TX_DEM6_011,
-	TX_DEM6_012,
-	TX_DEM6_013,
-	TX_DEM6_014,
-	TX_DEM6_015,
-	TX_DEM6_016,
-	TX_DEM6_017,
-	TX_DEM6_018,
-	TX_DEM6_019,
-	TX_DEM6_020,
-	TX_DEM6_021,
-	TX_DEM6_022,
-	TX_DEM6_023,
-	TX_DEM6_024,
-	TX_DEM6_025,
-	TX_DEM6_026,
-	TX_DEM6_027,
-	TX_DEM6_028,
-	TX_DEM6_029,
-	TX_DEM6_030,
-	TX_DEM6_031,
-	TX_DEM6_032,
-	TX_DEM6_033,
-	TX_DEM6_034,
-	TX_DEM6_035,
-	TX_DEM6_036,
-	TX_DEM6_037,
-	TX_DEM6_038,
-	TX_DEM6_039,
-	TX_DEM6_040,
-	TX_DEM6_041,
-	TX_DEM6_042,
-	TX_DEM6_043,
-	TX_DEM6_044,
-	TX_DEM6_045,
-	TX_DEM6_046,
-	TX_DEM6_047,
-	TX_DEM6_048,
-	TX_DEM6_049,
-	TX_DEM6_050,
-	TX_DEM6_051,
-	TX_DEM6_052,
-	TX_DEM6_053,
-	TX_DEM6N000,
-	TX_DEM6N001,
-	TX_DEM6N002,
-	TX_DEM6N003,
-	TX_DEM6N004,
-	TX_DEM6N005,
-	TX_DEM6N006,
-	TX_DEM6N007,
-	TX_DEM6N008,
-	TX_DEM6N009,
-	TX_DEM6N010,
-	TX_DEM6N011,
-	TX_DEM6N012,
-	TX_DEM6N013,
-	TX_DEM6N014,
-	TX_DEM6N015,
-	TX_DEM6N016,
-	TX_DEM6N017,
-	TX_DEM6N018,
-	TX_DEM6N019,
-	TX_DEM6N020,
-	TX_DEM6N021,
-	TX_DEM6N022,
-	TX_DEM6N023,
-	TX_DEM6N024,
-
 
 	TX_TUG0_001,
 	TX_TUG0_002,