cpp/openttd-patchpack/source Changeset - r18122:623505749ded

Changeset - r18122:623505749ded

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 13 years ago 2011-09-23 19:27:15
rubidium@openttd.org

(svn r22957) -Codechange: SPECSTR_PLAYERNAME is actually the company name, which is derived from the town name + ' Transport'. So make sure the last constant is in sync with the town name table

3 files changed with 7 insertions and 12 deletions:

src/company_cmd.cpp

src/saveload/strings_sl.cpp

src/strings_type.h

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -346,13 +346,13 @@ static void GenerateCompanyName(Company @@
 	Town *t = ClosestTownFromTile(c->last_build_coordinate, UINT_MAX);
 	StringID str;
 	uint32 strp;
 	if (t->name == NULL && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) {
-		str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_PLAYERNAME_START;
+		str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_COMPANY_NAME_START;
 		strp = t->townnameparts;
 verify_name:;
 		/* No companies must have this name already */
 		Company *cc;
 		FOR_ALL_COMPANIES(cc) {

src/saveload/strings_sl.cpp

➞

Show inline comments

@@ @@ -26,14 +26,14 @@ static const int LEN_OLD_STRINGS_TTO = @@
  */
 StringID RemapOldStringID(StringID s)
+{
 	switch (s) {
 		case 0x0006: return STR_SV_EMPTY;
 		case 0x7000: return STR_SV_UNNAMED;
 		case 0x70E4: return SPECSTR_PLAYERNAME_ENGLISH;
 		case 0x70E9: return SPECSTR_PLAYERNAME_ENGLISH;
 		case 0x70E4: return SPECSTR_COMPANY_NAME_START;
 		case 0x70E9: return SPECSTR_COMPANY_NAME_START;
 		case 0x8864: return STR_SV_TRAIN_NAME;
 		case 0x902B: return STR_SV_ROAD_VEHICLE_NAME;
 		case 0x9830: return STR_SV_SHIP_NAME;
 		case 0xA02F: return STR_SV_AIRCRAFT_NAME;
 		default:

src/strings_type.h

➞

Show inline comments

@@ @@ -51,22 +51,17 @@ enum SpecialStrings { @@
 	SPECSTR_TOWNNAME_DANISH,
 	SPECSTR_TOWNNAME_TURKISH,
 	SPECSTR_TOWNNAME_ITALIAN,
 	SPECSTR_TOWNNAME_CATALAN,
 	SPECSTR_TOWNNAME_LAST      = SPECSTR_TOWNNAME_CATALAN,
 	/* special strings for player names on the form "TownName transport". */
 	SPECSTR_PLAYERNAME_START   = 0x70EA,
 	SPECSTR_PLAYERNAME_ENGLISH = SPECSTR_PLAYERNAME_START,
 	SPECSTR_PLAYERNAME_FRENCH,
 	SPECSTR_PLAYERNAME_GERMAN,
 	SPECSTR_PLAYERNAME_AMERICAN,
 	SPECSTR_PLAYERNAME_LATIN,
 	SPECSTR_PLAYERNAME_SILLY,
 	SPECSTR_PLAYERNAME_LAST    = SPECSTR_PLAYERNAME_SILLY,
 	/* special strings for company names on the form "TownName transport". */
 	SPECSTR_COMPANY_NAME_START = 0x70EA,
 	SPECSTR_COMPANY_NAME_LAST  = SPECSTR_COMPANY_NAME_START + SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START,
 	SPECSTR_SILLY_NAME         = 0x70E5,
 	SPECSTR_ANDCO_NAME         = 0x70E6,
 	SPECSTR_PRESIDENT_NAME     = 0x70E7,
 	/* reserve MAX_LANG strings for the *.lng files */
 	SPECSTR_LANGUAGE_START     = 0x7100,
 	SPECSTR_LANGUAGE_END       = SPECSTR_LANGUAGE_START + MAX_LANG - 1,

0 comments (0 inline, 0 general)