diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-10 18:09:09 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-10 18:09:09 +0000 |
| commit | d4e1efc78b526682b02b5d85d89f48b980b7f0b4 (patch) | |
| tree | 1478836346b9d0f8824b9fd09d442438b10eb45b | |
| parent | d6bf0d10d0a1709fa34c86ab4d3d0df8431ceda8 (diff) | |
| download | openttd-d4e1efc78b526682b02b5d85d89f48b980b7f0b4.tar.xz | |
(svn r23183) -Codechange: merge BRIBE_FAILED and BRIBE_FAILED_2 messages (monoid)
| -rw-r--r-- | src/lang/english.txt | 3 | ||||
| -rw-r--r-- | src/town_cmd.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt index 1cbacc349..d620f47e7 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -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... diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index e3ed20d7a..8b293143f 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -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 |