From 2c16d68f458517dd2494b6231c98b6632c4105e7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 Apr 2016 20:49:13 -0400
Subject: TITANIC: Simplified item strings setup

---
 engines/titanic/titanic.cpp | 182 ++++++++++++--------------------------------
 1 file changed, 47 insertions(+), 135 deletions(-)

(limited to 'engines')

diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index ad91d7001b..9e24bbd4e9 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -120,143 +120,55 @@ Common::Error TitanicEngine::run() {
 }
 
 void TitanicEngine::setItemNames() {
-	// Names
-	_itemNames[0] = "LeftArmWith";
-	_itemNames[1] = "LeftArmWithout";
-	_itemNames[2] = "RightArmWith";
-	_itemNames[3] = "RightArmWithout";
-	_itemNames[4] = "BridgeRed";
-	_itemNames[5] = "BridgeYellow";
-	_itemNames[6] = "BridgeBlue";
-	_itemNames[7] = "BridgeGreen";
-	_itemNames[8] = "Parrot";
-	_itemNames[9] = "CentralCore";
-	_itemNames[10] = "BrainGreen";
-	_itemNames[11] = "BrainYellow";
-	_itemNames[12] = "BrainRed";
-	_itemNames[13] = "BrainBlue";
-	_itemNames[14] = "ChickenGreasy";
-	_itemNames[15] = "ChickenPlain";
-	_itemNames[16] = "ChickenPurple";
-	_itemNames[17] = "ChickenRed";
-	_itemNames[18] = "ChickenYellow";
-	_itemNames[19] = "CrushedTV";
-	_itemNames[20] = "Ear";
-	_itemNames[21] = "Ear1";
-	_itemNames[22] = "Eyeball";
-	_itemNames[23] = "Eyeball1";
-	_itemNames[24] = "Feather";
-	_itemNames[25] = "Lemon";
-	_itemNames[26] = "GlassEmpty";
-	_itemNames[27] = "GlassPurple";
-	_itemNames[28] = "GlassRed";
-	_itemNames[29] = "GlassYellow";
-	_itemNames[30] = "Hammer";
-	_itemNames[31] = "Hose";
-	_itemNames[32] = "HoseEnd";
-	_itemNames[33] = "LiftHead";
-	_itemNames[34] = "LongStick";
-	_itemNames[35] = "Magazine";
-	_itemNames[36] = "Mouth";
-	_itemNames[37] = "MusicKey";
-	_itemNames[38] = "Napkin";
-	_itemNames[39] = "Nose";
-	_itemNames[40] = "Perch";
-	_itemNames[41] = "PhonoCylinder";
-	_itemNames[42] = "PhonoCylinder1";
-	_itemNames[43] = "PhonoCylinder2";
-	_itemNames[44] = "PhonoCylinder3";
-	_itemNames[45] = "Photo";
-
-	// Item long descriptions
-	_itemDescriptions[0] = "The Maitre d'Bot's left arm holding a key";
-	_itemDescriptions[1] = "The Maitre d'Bot's left arm";
-	_itemDescriptions[2] = "The Maitre d'Bot's right arm holding Titania's auditory center";
-	_itemDescriptions[3] = "The Maitre d'Bot's right arm";
-	_itemDescriptions[4] = "Red Fuse";
-	_itemDescriptions[5] = "Yellow Fuse";
-	_itemDescriptions[6] = "Blue Fuse";
-	_itemDescriptions[7] = "Green Fuse";
-	_itemDescriptions[8] = "The Parrot";
-	_itemDescriptions[9] = "Titania's central intelligence core";
-	_itemDescriptions[10] = "Titania's auditory center";
-	_itemDescriptions[11] = "Titania's olfactory center";
-	_itemDescriptions[12] = "Titania's speech center";
-	_itemDescriptions[13] = "Titania's vision center";
-	_itemDescriptions[14] = "rather greasy chicken";
-	_itemDescriptions[15] = "very plain chicken";
-	_itemDescriptions[16] = "chicken smeared with starling pur$e";
-	_itemDescriptions[17] = "chicken covered with tomato sauce";
-	_itemDescriptions[18] = "chicken coated in mustard sauce";
-	_itemDescriptions[19] = "A crushed television set";
-	_itemDescriptions[20] = "Titania's ear";
-	_itemDescriptions[21] = "Titania's ear";
-	_itemDescriptions[22] = "Titania's eye";
-	_itemDescriptions[23] = "Titania's eye";
-	_itemDescriptions[24] = "A parrot feather";
-	_itemDescriptions[25] = "A nice fat juicy lemon";
-	_itemDescriptions[26] = "An empty beer glass";
-	_itemDescriptions[27] = "A beer glass containing pur$ed flock of starlings";
-	_itemDescriptions[28] = "A beer glass containing tomato sauce";
-	_itemDescriptions[29] = "A beer glass containing mustard sauce";
-	_itemDescriptions[30] = "A hammer";
-	_itemDescriptions[31] = "A hose";
-	_itemDescriptions[32] = "The other end of a hose";
-	_itemDescriptions[33] = "The LiftBot's head";
-	_itemDescriptions[34] = "A rather long stick";
-	_itemDescriptions[35] = "A magazine";
-	_itemDescriptions[36] = "Titania's mouth";
-	_itemDescriptions[37] = "A key";
-	_itemDescriptions[38] = "A super-absorbent napkin";
-	_itemDescriptions[39] = "Titania's nose";
-	_itemDescriptions[40] = "A perch";
-	_itemDescriptions[41] = "A phonograph cylinder";
-	_itemDescriptions[42] = "A phonograph cylinder";
-	_itemDescriptions[43] = "A phonograph cylinder";
-	_itemDescriptions[44] = "A phonograph cylinder";
-	_itemDescriptions[45] = "A photograph";
+	static const char *const NAMES[46] = {
+		"LeftArmWith", "LeftArmWithout", "RightArmWith", "RightArmWithout", "BridgeRed",
+		"BridgeYellow", "BridgeBlue", "BridgeGreen", "Parrot", "CentralCore", "BrainGreen",
+		"BrainYellow", "BrainRed", "BrainBlue", "ChickenGreasy", "ChickenPlain", "ChickenPurple",
+		"ChickenRed", "ChickenYellow", "CrushedTV", "Ear", "Ear1", "Eyeball", "Eyeball1",
+		"Feather", "Lemon", "GlassEmpty", "GlassPurple", "GlassRed", "GlassYellow", "Hammer",
+		"Hose", "HoseEnd", "LiftHead", "LongStick", "Magazine", "Mouth", "MusicKey", "Napkin",
+		"Nose", "Perch", "PhonoCylinder", "PhonoCylinder1", "PhonoCylinder2", "PhonoCylinder3",
+		"Photo"
+	};
+	for (uint idx = 0; idx < 46; ++idx)
+		_itemNames[idx] = NAMES[idx];
+
+	// Item descriptions
+	static const char *const DESCRIPTIONS[46] = {
+		"The Maitre d'Bot's left arm holding a key", "The Maitre d'Bot's left arm",
+		"The Maitre d'Bot's right arm holding Titania's auditory center",
+		"The Maitre d'Bot's right arm", "Red Fuse", "Yellow Fuse", "Blue Fuse",
+		"Green Fuse", "The Parrot", "Titania's central intelligence core",
+		"Titania's auditory center", "Titania's olfactory center",
+		"Titania's speech center", "Titania's vision center", "rather greasy chicken",
+		"very plain chicken", "chicken smeared with starling pur$e",
+		"chicken covered with tomato sauce", "chicken coated in mustard sauce",
+		"A crushed television set", "Titania's ear", "Titania's ear", "Titania's eye",
+		"Titania's eye", "A parrot feather", "A nice fat juicy lemon",
+		"An empty beer glass", "A beer glass containing pur$ed flock of starlings",
+		"A beer glass containing tomato sauce", "A beer glass containing mustard sauce",
+		"A hammer", "A hose", "The other end of a hose", "The LiftBot's head",
+		"A rather long stick", "A magazine", "Titania's mouth", "A key",
+		"A super-absorbent napkin", "Titania's nose", "A perch", "A phonograph cylinder",
+		"A phonograph cylinder", "A phonograph cylinder", "A phonograph cylinder",
+		"A photograph"
+	};
+	for (uint idx = 0; idx < 46; ++idx)
+		_itemDescriptions[idx] = DESCRIPTIONS[idx];
 
 	// Short descriptions.. maybe?
-	_itemShortDesc[0] = "MaitreD Left Arm";
-	_itemShortDesc[1] = "MaitreD Right Arm";
-	_itemShortDesc[2] = "OlfactoryCentre";
-	_itemShortDesc[3] = "AuditoryCentre";
-	_itemShortDesc[4] = "SpeechCentre";
-	_itemShortDesc[5] = "VisionCentre";
-	_itemShortDesc[6] = "CentralCore";
-	_itemShortDesc[7] = "Perch";
-	_itemShortDesc[8] = "SeasonBridge";
-	_itemShortDesc[9] = "FanBridge";
-	_itemShortDesc[10] = "BeamBridge";
-	_itemShortDesc[11] = "ChickenBridge";
-	_itemShortDesc[12] = "CarryParrot";
-	_itemShortDesc[13] = "Chicken";
-	_itemShortDesc[14] = "CrushedTV";
-	_itemShortDesc[15] = "Feathers";
-	_itemShortDesc[16] = "Lemon";
-	_itemShortDesc[17] = "BeerGlass";
-	_itemShortDesc[18] = "BigHammer";
-	_itemShortDesc[19] = "Ear1";
-	_itemShortDesc[20] = "Ear 2";
-	_itemShortDesc[21] = "Eye1";
-	_itemShortDesc[22] = "Eye2";
-	_itemShortDesc[23] = "Mouth";
-	_itemShortDesc[24] = "Nose";
-	_itemShortDesc[25] = "NoseSpare";
-	_itemShortDesc[26] = "Hose";
-	_itemShortDesc[27] = "DeadHoseSpare";
-	_itemShortDesc[28] = "HoseEnd";
-	_itemShortDesc[29] = "DeadHoseEndSpare";
-	_itemShortDesc[30] = "BrokenLiftbotHead";
-	_itemShortDesc[31] = "LongStick";
-	_itemShortDesc[32] = "Magazine";
-	_itemShortDesc[33] = "Napkin";
-	_itemShortDesc[34] = "Phonograph Cylinder";
-	_itemShortDesc[35] = "Phonograph Cylinder 1";
-	_itemShortDesc[36] = "Phonograph Cylinder 2";
-	_itemShortDesc[37] = "Phonograph Cylinder 3";
-	_itemShortDesc[38] = "Photograph";
-	_itemShortDesc[39] = "Music System Key";
+	static const char *const SHORT_DESC[40] = {
+		"MaitreD Left Arm", "MaitreD Right Arm", "OlfactoryCentre", "AuditoryCentre",
+		"SpeechCentre", "VisionCentre", "CentralCore", "Perch", "SeasonBridge",
+		"FanBridge", "BeamBridge", "ChickenBridge", "CarryParrot", "Chicken",
+		"CrushedTV", "Feathers", "Lemon", "BeerGlass", "BigHammer", "Ear1", "Ear 2",
+		"Eye1", "Eye2", "Mouth", "Nose", "NoseSpare", "Hose", "DeadHoseSpare",
+		"HoseEnd", "DeadHoseEndSpare", "BrokenLiftbotHead", "LongStick", "Magazine",
+		"Napkin", "Phonograph Cylinder", "Phonograph Cylinder 1", "Phonograph Cylinder 2",
+		"Phonograph Cylinder 3", "Photograph", "Music System Key"
+	};
+	for (uint idx = 0; idx < 40; ++idx)
+		_itemShortDesc[idx] = SHORT_DESC[idx];
 }
 
 
-- 
cgit v1.2.3