cpp/openttd-patchpack/source Changeset - r19437:273b94619371

Changeset - r19437:273b94619371

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 12 years ago 2012-06-23 15:27:15
frosch@openttd.org

(svn r24354) -Fix: When airport construction was denied due to noise, the error message named the wrong town.

1 file changed with 4 insertions and 1 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2165,11 +2165,13 @@ CommandCost CmdBuildAirport(TileIndex ti @@
 	/* Check if local auth would allow a new airport */
 	StringID authority_refuse_message = STR_NULL;
 	Town *authority_refuse_town = NULL;
 	if (_settings_game.economy.station_noise_level) {
 		/* do not allow to build a new airport if this raise the town noise over the maximum allowed by town */
 		if ((nearest->noise_reached + newnoise_level) > nearest->MaxTownNoise()) {
 			authority_refuse_message = STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE;
 			authority_refuse_town = nearest;
+		}
 	} else {
 		uint num = 0;
@@ @@ -2179,11 +2181,12 @@ CommandCost CmdBuildAirport(TileIndex ti @@
+		}
 		if (num >= 2) {
 			authority_refuse_message = STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT;
 			authority_refuse_town = t;
+		}
+	}
 	if (authority_refuse_message != STR_NULL) {
-		SetDParam(0, t->index);
+		SetDParam(0, authority_refuse_town->index);
 		return_cmd_error(authority_refuse_message);
+	}

0 comments (0 inline, 0 general)