cpp/openttd-patchpack/source Changeset - r23003:c4625c6f2a85

Changeset - r23003:c4625c6f2a85

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Max Maton - 6 years ago 2018-09-16 03:17:10
max@maton.info

Fix #6622: Fixes empty company name in news when gamescript constructs a town

2 files changed with 16 insertions and 9 deletions:

src/lang/english.txt

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -815,6 +815,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE @@
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Manager)
 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{RAW_STRING} sponsored construction of new town {TOWN}!
 STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}A new town called {TOWN} has been constructed!
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}New {STRING} under construction near {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}New {STRING} being planted near {TOWN}!

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -1798,15 +1798,21 @@ CommandCost CmdFoundTown(TileIndex tile, @@
 		if (_game_mode != GM_EDITOR) {
 			/* 't' can't be NULL since 'random' is false outside scenedit */
 			assert(!random);
 			char company_name[MAX_LENGTH_COMPANY_NAME_CHARS * MAX_CHAR_LENGTH];
 			SetDParam(0, _current_company);
 			GetString(company_name, STR_COMPANY_NAME, lastof(company_name));
 			char *cn = stredup(company_name);
 			SetDParamStr(0, cn);
 			SetDParam(1, t->index);
 			AddTileNewsItem(STR_NEWS_NEW_TOWN, NT_INDUSTRY_OPEN, tile, cn);
 			if (_current_company == OWNER_DEITY) {
 				SetDParam(0, t->index);
 				AddTileNewsItem(STR_NEWS_NEW_TOWN_UNSPONSORED, NT_INDUSTRY_OPEN, tile);
 			} else {
 				char company_name[MAX_LENGTH_COMPANY_NAME_CHARS * MAX_CHAR_LENGTH];
 				SetDParam(0, _current_company);
 				GetString(company_name, STR_COMPANY_NAME, lastof(company_name));
 				char *cn = stredup(company_name);
 				SetDParamStr(0, cn);
 				SetDParam(1, t->index);
 				AddTileNewsItem(STR_NEWS_NEW_TOWN, NT_INDUSTRY_OPEN, tile, cn);
+			}
 			AI::BroadcastNewEvent(new ScriptEventTownFounded(t->index));
 			Game::NewEvent(new ScriptEventTownFounded(t->index));
+		}

0 comments (0 inline, 0 general)