Mercurial > hg > openttd
changeset 18347:fdc15051da1c draft
(svn r23183) -Codechange: merge BRIBE_FAILED and BRIBE_FAILED_2 messages (monoid)
author | rubidium <rubidium@openttd.org> |
---|---|
date | Thu, 10 Nov 2011 18:09:09 +0000 |
parents | e1ac3eaf52c0 |
children | d74724cd6469 |
files | src/lang/english.txt src/town_cmd.cpp |
diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3514,8 +3514,7 @@ STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}{TOWN} local authority refuses to allow another airport to be built in this town STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE :{WHITE}{TOWN} local authority refuses permission for airport due to noise concerns -STR_ERROR_BRIBE_FAILED :{WHITE}Your attempted bribe has been -STR_ERROR_BRIBE_FAILED_2 :{WHITE}discovered by a regional investigator +STR_ERROR_BRIBE_FAILED :{WHITE}Your attempted bribe has been discovered by a regional investigator # Levelling errors STR_ERROR_CAN_T_RAISE_LAND_HERE :{WHITE}Can't raise land here...
--- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -2618,7 +2618,7 @@ /* only show errormessage to the executing player. All errors are handled command.c * but this is special, because it can only 'fail' on a DC_EXEC */ - if (IsLocalCompany()) ShowErrorMessage(STR_ERROR_BRIBE_FAILED, STR_ERROR_BRIBE_FAILED_2, WL_INFO); + if (IsLocalCompany()) ShowErrorMessage(STR_ERROR_BRIBE_FAILED, INVALID_STRING_ID, WL_INFO); /* decrease by a lot! * ChangeTownRating is only for stuff in demolishing. Bribe failure should