cpp/openttd-patchpack/source Changeset - r18337:1a99fee4c2e3

Changeset - r18337:1a99fee4c2e3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 13 years ago 2011-11-10 18:09:09
rubidium@openttd.org

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

2 files changed with 2 insertions and 3 deletions:

src/lang/english.txt

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -3514,8 +3514,7 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED @@
 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...

src/town_cmd.cpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)