[Scummvm-git-logs] scummvm master -> 2f406c0fd81e643e5e0331e75624189e3509ad83

dreammaster dreammaster at scummvm.org
Sat Nov 12 23:47:51 CET 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b2113baf23 DEVTOOLS: Add room location strings to titanic.dat
2f406c0fd8 TITANIC: Change RoomFlags to use titanic.dat


Commit: b2113baf23a2608d6f02c44f8fd7066da52f9c78
    https://github.com/scummvm/scummvm/commit/b2113baf23a2608d6f02c44f8fd7066da52f9c78
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-12T17:34:50-05:00

Commit Message:
DEVTOOLS: Add room location strings to titanic.dat

Changed paths:
    devtools/create_titanic/create_titanic_dat.cpp



diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index b788733..41cdad4 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -416,7 +416,7 @@ static const BedheadEntry OFF_RESTING_D_WRONG[1] = {
 	{ "Any", "Any", "Any", "ClosedWrong", 59, 70 }
 };
 
-static const char *const STRINGS_EN[108] = {
+static const char *const STRINGS_EN[133] = {
 	"",
 	"You are standing outside the Pellerator.",
 	"I'm sorry, you cannot enter this pellerator at present as a bot is in the way.",
@@ -512,7 +512,7 @@ static const char *const STRINGS_EN[108] = {
 	"Deploy comfort workstation",
 	"Deploy minor horizontally mobile storage compartment",
 	"Deploy major semi-recumbent relaxation device",
-	"Inflate fully recumbent relaxation device ",
+	"Inflate fully recumbent relaxation device",
 	"Deploy personal maintenance hub",
 	"Deploy executive horizontal worksurface",
 	"Deploy minor semi-recumbent relaxation device",
@@ -529,10 +529,35 @@ static const char *const STRINGS_EN[108] = {
 	"Go to the Promenade Deck",
 	"Go to the Arboretum",
 	"Go to the Music Room",
-	"Go to the First Class Restaurant"
+	"Go to the First Class Restaurant",
+	"The Parrot Lobby",
+	"The Creators' Chamber",
+	"The Bridge",
+	"The Bilge Room",
+	"The Sculpture Chamber",
+	"The Arboretum",
+	"The Bottom of the Well",
+	"The Promenade Deck",
+	"The 1st class restaurant",
+	"Titania's Room",
+	"The Bar",
+	"The Embarkation Lobby",
+	"The Music Room",
+	"Unknown Room",
+	"The Service Elevator",
+	"The Super Galactic Leisure Lounge",
+	"The Elevator",
+	"The Dome",
+	"The Pellerator",
+	"The Top of the Well",
+	"Nowhere you're likely to want to go.",
+	"1st class",
+	"2nd class",
+	"SGT class",
+	"no class"
 };
 
-static const char *const STRINGS_DE[152] = {
+static const char *const STRINGS_DE[177] = {
 	// TODO: Still many strings to translate to German
 	"",
 	"Sie befinden sich vor dem Pellerator.",
@@ -662,6 +687,31 @@ static const char *const STRINGS_DE[152] = {
 	"Go to the Arboretum",
 	"Go to the Music Room",
 	"Go to the First Class Restaurant"
+	"The Parrot Lobby",
+	"The Creators' Chamber",
+	"The Bridge",
+	"The Bilge Room",
+	"The Sculpture Chamber",
+	"The Arboretum",
+	"The Bottom of the Well",
+	"The Promenade Deck",
+	"The 1st class restaurant",
+	"Titania's Room",
+	"The Bar",
+	"The Embarkation Lobby",
+	"The Music Room",
+	"Unknown Room",
+	"The Service Elevator",
+	"The Super Galactic Leisure Lounge",
+	"The Elevator",
+	"The Dome",
+	"The Pellerator",
+	"The Top of the Well",
+	"Nowhere you're likely to want to go.",
+	"1st class",
+	"2nd class",
+	"SGT class",
+	"no class",
 
 	"Sommer",
 	"Herbst",
@@ -1191,8 +1241,8 @@ void writeData() {
 	writeStringArray("TEXT/ITEM_NAMES", ITEM_NAMES, 46);
 	writeStringArray("TEXT/ITEM_IDS", ITEM_IDS, 40);
 	writeStringArray("TEXT/ROOM_NAMES", ROOM_NAMES, 34);
-	writeStringArray("TEXT/STRINGS", STRINGS_EN, 108);
-	writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 152);
+	writeStringArray("TEXT/STRINGS", STRINGS_EN, 133);
+	writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 177);
 	const int TEXT_PHRASES[3] = { 0x61D3C8, 0x618340, 0x61B1E0 };
 	const int TEXT_REPLACEMENTS1[3] = { 0x61D9B0, 0x61C788, 0x61B7C8 };
 	const int TEXT_REPLACEMENTS2[3] = { 0x61DD20, 0x61CAF8, 0x61BB38 };


Commit: 2f406c0fd81e643e5e0331e75624189e3509ad83
    https://github.com/scummvm/scummvm/commit/2f406c0fd81e643e5e0331e75624189e3509ad83
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-12T17:47:42-05:00

Commit Message:
TITANIC: Change RoomFlags to use titanic.dat

Changed paths:
    engines/titanic/room_flags.cpp
    engines/titanic/support/strings.h



diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp
index 66519aa..1be0b0a 100644
--- a/engines/titanic/room_flags.cpp
+++ b/engines/titanic/room_flags.cpp
@@ -138,6 +138,8 @@ int CRoomFlags::getRoomArea() const {
 }
 
 CString CRoomFlags::getRoomDesc() const {
+	Strings &str = g_vm->_strings;
+
 	switch (getRoomArea()) {
 	case 1:
 	case 2:
@@ -155,58 +157,58 @@ CString CRoomFlags::getRoomDesc() const {
 	case 4:
 		switch (_data) {
 		case 0x1D0D9:
-			return "The Parrot Lobby";
+			return str[THE_PARROT_LOBBY];
 		case 0x2F86D:
-			return "The Creators' Chamber";
+			return str[THE_CREATORS_CHAMBER];
 		case 0x39FCB:
-			return "The Bridge";
+			return str[THE_BRIDGE];
 		case 0x3D94B:
-			return "The Bilge Room";
+			return str[THE_BILGE_ROOM];
 		case 0x465FB:
-			return "The Sculpture Chamber";
+			return str[THE_SCULPTURE_CHAMBER];
 		case 0x4D6AF:
-			return "The Arboretum";
+			return str[THE_ARBORETUM];
 		case 0x59FAD:
-			return "The Bottom of the Well";
+			return str[THE_BOTTOM_OF_THE_WELL];
 		case 0x79C45:
-			return "The Promenade Deck";
+			return str[THE_PROMENADE_DECK];
 		case 0x896B9:
-			return "The 1st class restaurant";
+			return str[RESTAURANT_1ST_CLASS];
 		case 0x8A397:
-			return "Titania's Room";
+			return str[TITANIAS_ROOM];
 		case 0xB3D97:
-			return "The Bar";
+			return str[THE_BAR];
 		case 0xCC971:
-			return "The Embarkation Lobby";
+			return str[THE_EMBARKATION_LOBBY];
 		case 0xF34DB:
-			return  "The Music Room";
+			return  str[THE_MUSIC_ROOM];
 		default:
 			break;
 		}
-		return "Unknown Room";
+		return str[UNKNOWN_ROOM];
 
 	case 5:
 		if (isTransportRoom()) {
 			switch (_data) {
 			case 0x68797:
-				return "The Service Elevator";
+				return str[THE_SERVICE_ELEVATOR];
 			case 0x5D3AD:
-				return "The Super Galactic Leisure Lounge";
+				return str[SGT_LEISURE_LOUNGE];
 			case 0x96E45:
-				return "The Elevator";
+				return str[THE_ELEVATOR];
 			case 0xAD171:
-				return "The Dome";
+				return str[THE_DOME];
 			case 0xC95E9:
-				return "The Pellerator";
+				return str[THE_PELLERATOR];
 			case 0xDF4D1:
-				return  "The Top of the Well";
+				return str[THE_TOP_OF_THE_WELL];
 			default:
 				break;
 			}
 		}
 
 		if (getRoomCategory() == 0) {
-			return "Nowhere you're likely to want to go.";
+			return str[NOWHERE_TO_GO];
 		} else {
 			CString result = getPassengerClassDesc();
 			result += ", ";
@@ -219,7 +221,7 @@ CString CRoomFlags::getRoomDesc() const {
 		break;
 	}
 
-	return "Unknown Room";
+	return str[UNKNOWN_ROOM];
 }
 
 void CRoomFlags::setElevatorBits(uint val) {
@@ -242,16 +244,17 @@ uint CRoomFlags::getPassengerClassBits() const {
 
 CString CRoomFlags::getPassengerClassDesc() const {
 	PassengerClass classNum = getPassengerClassNum();
+	Strings &str = g_vm->_strings;
 
 	switch (classNum) {
 	case FIRST_CLASS:
-		return "1st class";
+		return str[CLASS_1];
 	case SECOND_CLASS:
-		return "2nd class";
+		return str[CLASS_2];
 	case THIRD_CLASS:
-		return "SGT class";
+		return str[CLASS_3];
 	default:
-		return "no class";
+		return str[CLASS_NONE];
 	}
 }
 
diff --git a/engines/titanic/support/strings.h b/engines/titanic/support/strings.h
index 30aad89..e82f882 100644
--- a/engines/titanic/support/strings.h
+++ b/engines/titanic/support/strings.h
@@ -137,6 +137,31 @@ enum StringId {
 	GO_TO_ARBORETUM,
 	GO_TO_MUSIC_ROOM,
 	GO_TO_1ST_CLASS_RESTAURANT,
+	THE_PARROT_LOBBY,
+	THE_CREATORS_CHAMBER,
+	THE_BRIDGE,
+	THE_BILGE_ROOM,
+	THE_SCULPTURE_CHAMBER,
+	THE_ARBORETUM,
+	THE_BOTTOM_OF_THE_WELL,
+	THE_PROMENADE_DECK,
+	RESTAURANT_1ST_CLASS,
+	TITANIAS_ROOM,
+	THE_BAR,
+	THE_EMBARKATION_LOBBY,
+	THE_MUSIC_ROOM,
+	UNKNOWN_ROOM,
+	THE_SERVICE_ELEVATOR,
+	SGT_LEISURE_LOUNGE,
+	THE_ELEVATOR,
+	THE_DOME,
+	THE_PELLERATOR,
+	THE_TOP_OF_THE_WELL,
+	NOWHERE_TO_GO,
+	CLASS_1,
+	CLASS_2,
+	CLASS_3,
+	CLASS_NONE,
 
 	// German version only
 	DE_SUMMER,





More information about the Scummvm-git-logs mailing list