STARTREK: Read TUG0 description messages from the respective RDF file

3 files changed, 15 insertions, 47 deletions

diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp
index 7c31e8d7f3..0ae7f52dcf 100644
--- a/engines/startrek/rooms/tug0.cpp
+++ b/engines/startrek/rooms/tug0.cpp
@@ -48,9 +48,9 @@ void Room::tug0Tick1() {
 
 void Room::tug0LookAtEngineer() {
 	if (_awayMission->tug.engineerConscious)
-		showDescription(TX_TUG0N002);
+		showDescription(2, true);
 	else
-		showDescription(TX_TUG0N014);
+		showDescription(14, true);
 }
 
 void Room::tug0GetEngineer() {
@@ -59,9 +59,9 @@ void Room::tug0GetEngineer() {
 
 void Room::tug0LookAtControls() {
 	if (_awayMission->tug.transporterRepaired)
-		showDescription(TX_TUG0N012);
+		showDescription(12, true);
 	else
-		showDescription(TX_TUG0N001);
+		showDescription(1, true);
 }
 
 void Room::tug0UseSpockOnControls() {
@@ -208,15 +208,15 @@ void Room::tug0KirkGotTransmogrifier() {
 
 void Room::tug0LookAtToolbox() {
 	if (_awayMission->tug.gotTransmogrifier)
-		showDescription(TX_TUG0N008);
+		showDescription(8, true);
 	else
-		showDescription(TX_TUG0N000);
+		showDescription(0, true);
 }
 
 void Room::tug0UsePhaserOnWelder() {
 	loseItem(OBJECT_IPWE);
 	giveItem(OBJECT_IPWF);
-	showDescription(TX_TUG0N006);
+	showDescription(6, true);
 
 	// BUGFIX: this following line didn't exist, despite it existing in TUG1; meaning this
 	// was supposed to give points, but it only did in a specific room.
@@ -224,7 +224,7 @@ void Room::tug0UsePhaserOnWelder() {
 }
 
 void Room::tug0UseWelderOnWireScraps() {
-	showDescription(TX_TUG0N010);
+	showDescription(10, true);
 	loseItem(OBJECT_IWIRSCRP);
 }
 
@@ -387,27 +387,27 @@ void Room::tug0WalkToDoor() {
 }
 
 void Room::tug0LookAtKirk() {
-	showDescription(TX_TUG0N003);
+	showDescription(3, true);
 }
 
 void Room::tug0LookAtSpock() {
-	showDescription(TX_TUG0N007);
+	showDescription(7, true);
 }
 
 void Room::tug0LookAtMccoy() {
-	showDescription(TX_TUG0N005);
+	showDescription(5, true);
 }
 
 void Room::tug0LookAtRedshirt() {
-	showDescription(TX_TUG0N004);
+	showDescription(4, true);
 }
 
 void Room::tug0LookAtTransporter() {
-	showDescription(TX_TUG0N013);
+	showDescription(13, true);
 }
 
 void Room::tug0LookAtDoor() {
-	showDescription(TX_TUG0N011);
+	showDescription(11, true);
 }
 
 void Room::tug0TalkToKirk() {
@@ -444,7 +444,7 @@ void Room::tug0UseCommunicator() {
 }
 
 void Room::tug0LookAnywhere() {
-	showDescription(TX_TUG0N009);
+	showDescription(9, true);
 }
 
 void Room::tug0UseSTricorderAnywhere() {
diff --git a/engines/startrek/text.cpp b/engines/startrek/text.cpp
index 92dfe2472b..f1bb2d9d91 100644
--- a/engines/startrek/text.cpp
+++ b/engines/startrek/text.cpp
@@ -159,22 +159,6 @@ extern const char *const g_gameStrings[] = {
 	"#TUG0\\TUG0L008#If we could get past the forcefield on the door of the bridge, we should be able to surprise them for sure.",
 	"#TUG0\\TUG0L009#Security analysis, sir: if we transport onto the bridge, we'll have the drop on them -- assuming Mr. Spock has the transporter working porperly.",
 	"#TUG0\\TUG0L010#Since we have a bomb, Captain, we could rearm it, transport it onto the bridge, and perhaps the Elasi will flee into the hallway. Then we could capture them.",
-	"#TUG0\\TUG0N000#A Runcinate Transmogrifier: An engineering tool used in the maintainance of transporters, which can be fitted with bits having a variety of irregularly serrated surfaces.",
-	"#TUG0\\TUG0N001#A small bomb appears to have damaged the transporter controls.",
-	"#TUG0\\TUG0N002#Crewman Simpson.",
-	"#TUG0\\TUG0N003#James T. Kirk cautiously watches the area.",
-	"#TUG0\\TUG0N004#Lieutenant Christensen stands ready.",
-	"#TUG0\\TUG0N005#McCoy wonders how many patients he'll have on this mission.",
-	"#TUG0\\TUG0N006#Phaser Welder is now charged.",
-	"#TUG0\\TUG0N007#Spock quietly analyzes the damaged areas of this transporter room.",
-	"#TUG0\\TUG0N008#The cabinet is empty.",
-	"#TUG0\\TUG0N009#The transporter bay has been damaged in a recent fire fight.",
-	"#TUG0\\TUG0N010#The wire scraps are too small, they melt instead of fusing together, and you're left with nothing. ",
-	"#TUG0\\TUG0N011#These doors have been scarred by phaser fire. There was a battle here.",
-	"#TUG0\\TUG0N012#These transporter controls are now operational. They are set for just inside the bridge door.",
-	"#TUG0\\TUG0N013#This is the main transporter pad of the Masada.",
-	"#TUG0\\TUG0N014#This man was obviously the transporter engineer. He is unconscious, but alive.",
-
 
 	"#TUG1\\TUG1_001#This is a mess now, isn't it?",
 	"#TUG1\\TUG1_002#A forcefield of unusual configurations has been erected in front of the doorway which leads into the bridge. I don't think it would be healthy to approach too closely, Captain.",
diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index 02709345c4..150ae51703 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -218,22 +218,6 @@ enum GameStringIDs {
 	TX_TUG0L008,
 	TX_TUG0L009,
 	TX_TUG0L010,
-	TX_TUG0N000,
-	TX_TUG0N001,
-	TX_TUG0N002,
-	TX_TUG0N003,
-	TX_TUG0N004,
-	TX_TUG0N005,
-	TX_TUG0N006,
-	TX_TUG0N007,
-	TX_TUG0N008,
-	TX_TUG0N009,
-	TX_TUG0N010,
-	TX_TUG0N011,
-	TX_TUG0N012,
-	TX_TUG0N013,
-	TX_TUG0N014,
-
 
 	TX_TUG1_001,
 	TX_TUG1_002,