cpp/openttd-patchpack/source Changeset - r14733:d5287af271c9

Changeset - r14733:d5287af271c9

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 14 years ago 2010-03-06 01:58:55
yexo@openttd.org

(svn r19331) -Fix: when deleting an airport the size from the AirportSpec was used instead of the stored airport size
-Fix (r19319): detecting if a plane was landed at an airport failed
-Fix: reset the airporttile mapping when restarting a game

3 files changed with 4 insertions and 7 deletions:

src/newgrf_airporttiles.h

src/openttd.cpp

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/newgrf_airporttiles.h

➞

Show inline comments

@@ @@ -15,7 +15,6 @@ @@
 #include "airport.h"
 #include "station_map.h"
 #include "newgrf_commons.h"
 #include "airport.h"
 /** Animation triggers for airport tiles */
 enum AirpAnimationTrigger {

src/openttd.cpp

➞

Show inline comments

@@ @@ -313,6 +313,7 @@ static void InitializeDynamicVariables() @@
 	_house_mngr.ResetMapping();
 	_industry_mngr.ResetMapping();
 	_industile_mngr.ResetMapping();
 	_airporttile_mngr.ResetMapping();
+}

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2229,10 +2229,6 @@ static CommandCost RemoveAirport(TileInd @@
 	tile = st->airport.tile;
 	const AirportSpec *as = st->GetAirportSpec();
 	int w = as->size_x;
 	int h = as->size_y;
 	CommandCost cost(EXPENSES_CONSTRUCTION);
 	const Aircraft *a;
@@ @@ -2244,7 +2240,7 @@ static CommandCost RemoveAirport(TileInd @@
 	TILE_AREA_LOOP(tile_cur, st->airport) {
 		if (!st->TileBelongsToAirport(tile_cur)) continue;
-		CommandCost ret = EnsureNoVehicleOnGround(tile);
+		CommandCost ret = EnsureNoVehicleOnGround(tile_cur);
 		ret.SetGlobalErrorMessage();
 		if (ret.Failed()) return ret;
@@ @@ -2257,6 +2253,7 @@ static CommandCost RemoveAirport(TileInd @@
+	}
 	if (flags & DC_EXEC) {
 		const AirportSpec *as = st->GetAirportSpec();
 		for (uint i = 0; i < as->nof_depots; ++i) {
 			DeleteWindowById(
 				WC_VEHICLE_DEPOT, st->GetHangarTile(i)
@@ @@ -2269,7 +2266,7 @@ static CommandCost RemoveAirport(TileInd @@
 		Town *nearest = AirportGetNearestTown(as, tile);
 		nearest->noise_reached -= GetAirportNoiseLevelForTown(as, nearest->xy, tile);
 		st->rect.AfterRemoveRect(st, tile, w, h);
+		st->rect.AfterRemoveRect(st, tile, st->airport.w, st->airport.h);
 		st->airport.Clear();
 		st->facilities &= ~FACIL_AIRPORT;

0 comments (0 inline, 0 general)