mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r23183) -Codechange: merge BRIBE_FAILED and BRIBE_FAILED_2 messages (monoid)

This commit is contained in:
rubidium 2011-11-10 18:09:09 +00:00
parent d6bf0d10d0
commit d4e1efc78b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lang/english.txt
View File

@ -3514,8 +3514,7 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}Not allo
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...

2
src/town_cmd.cpp
View File

@ -2618,7 +2618,7 @@ static CommandCost TownActionBribe(Town *t, DoCommandFlag flags)
/* 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