summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-06-23 15:27:15 +0000
committerfrosch <frosch@openttd.org>2012-06-23 15:27:15 +0000
commitca10522e8d65ec1ee2cfd8501648d1a5a78e131f (patch)
tree6f7a63321f0d9acbfb96420dfdab24cdd5fc6788
parentef394916c93a702250d7bd677f163beea880a989 (diff)
downloadopenttd-ca10522e8d65ec1ee2cfd8501648d1a5a78e131f.tar.xz
(svn r24354) -Fix: When airport construction was denied due to noise, the error message named the wrong town.
-rw-r--r--src/station_cmd.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index e3e4d27b2..e246c2326 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2165,11 +2165,13 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
/* 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 tile, DoCommandFlag flags, uint32 p1, uint
}
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);
}