diff options
| author | rubidium <rubidium@openttd.org> | 2009-08-05 17:59:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-08-05 17:59:21 +0000 |
| commit | 1fe3ad3288fd2198f5480f75a17b707cd2a3c2af (patch) | |
| tree | 89d8ada3dbf29005d4cf5ab88204c3b24dd97795 /src/economy.cpp | |
| parent | 2fe966fd8c56a7cab7a4a9dd9485e0034e6cf7f0 (diff) | |
| download | openttd-1fe3ad3288fd2198f5480f75a17b707cd2a3c2af.tar.xz | |
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
Diffstat (limited to 'src/economy.cpp')
| -rw-r--r-- | src/economy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 39c030ebd..e6084e654 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -491,7 +491,7 @@ static void CompanyCheckBankrupt(Company *c) SetDParam(0, STR_NEWS_COMPANY_IN_TROUBLE_TITLE); SetDParam(1, STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION); SetDParamStr(2, cni->company_name); - AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_TROUBLE, cni); + AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_TROUBLE, cni); AI::BroadcastNewEvent(new AIEventCompanyInTrouble(c->index)); break; case 3: { @@ -501,7 +501,7 @@ static void CompanyCheckBankrupt(Company *c) SetDParam(0, STR_NEWS_COMPANY_IN_TROUBLE_TITLE); SetDParam(1, STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION); SetDParamStr(2, cni->company_name); - AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_TROUBLE, cni); + AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_TROUBLE, cni); break; } @@ -536,7 +536,7 @@ static void CompanyCheckBankrupt(Company *c) SetDParam(0, STR_NEWS_COMPANY_BANKRUPT_TITLE); SetDParam(1, STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION); SetDParamStr(2, cni->company_name); - AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_BANKRUPT, cni); + AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_BANKRUPT, cni); /* Remove the company */ ChangeNetworkOwner(c->index, COMPANY_SPECTATOR); @@ -1532,7 +1532,7 @@ static void DoAcquireCompany(Company *c) SetDParamStr(2, cni->company_name); SetDParamStr(3, cni->other_company_name); SetDParam(4, c->bankrupt_value); - AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_MERGER, cni); + AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_MERGER, cni); AI::BroadcastNewEvent(new AIEventCompanyMerger(ci, _current_company)); /* original code does this a little bit differently */ @@ -1584,7 +1584,7 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, if (c == NULL || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR; /* Protect new companies from hostile takeovers */ - if (_cur_year - c->inaugurated_year < 6) return_cmd_error(STR_PROTECTED); + if (_cur_year - c->inaugurated_year < 6) return_cmd_error(STR_ERROR_PROTECTED); /* Those lines are here for network-protection (clients can be slow) */ if (GetAmountOwnedBy(c, COMPANY_SPECTATOR) == 0) return cost; |