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

@@ @@ -12,13 +12,12 @@ @@
 #ifndef NEWGRF_AIRPORTTILES_H
 #define NEWGRF_AIRPORTTILES_H
 #include "airport.h"
 #include "station_map.h"
 #include "newgrf_commons.h"
 #include "airport.h"
 /** Animation triggers for airport tiles */
 enum AirpAnimationTrigger {
 	AAT_BUILT,               ///< Triggered when the airport it build (for all tiles at the same time)
 	AAT_TILELOOP,            ///< Triggered in the periodic tile loop
 	AAT_STATION_NEW_CARGO,   ///< Triggered when new cargo arrives at the station (for all tiles at the same time)

src/openttd.cpp

➞

Show inline comments

@@ @@ -310,12 +310,13 @@ static void InitializeDynamicVariables() @@
+{
 	/* Dynamic stuff needs to be initialized somewhere... */
 	_engine_mngr.ResetToDefaultMapping();
 	_house_mngr.ResetMapping();
 	_industry_mngr.ResetMapping();
 	_industile_mngr.ResetMapping();
 	_airporttile_mngr.ResetMapping();
+}
 /** Unitializes drivers, frees allocated memory, cleans pools, ...
  * Generally, prepares the game for shutting down
  */

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2226,53 +2226,50 @@ static CommandCost RemoveAirport(TileInd @@
 	if (_current_company != OWNER_WATER && !CheckOwnership(st->owner)) {
 		return CMD_ERROR;
+	}
 	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;
 	FOR_ALL_AIRCRAFT(a) {
 		if (!a->IsNormalAircraft()) continue;
 		if (a->targetairport == st->index && a->state != FLYING) return CMD_ERROR;
+	}
 	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;
 		cost.AddCost(_price[PR_CLEAR_STATION_AIRPORT]);
 		if (flags & DC_EXEC) {
 			DeleteAnimatedTile(tile_cur);
 			DoClearSquare(tile_cur);
+		}
+	}
 	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)
 			);
+		}
 		/* Go get the final noise level, that is base noise minus factor from distance to town center.
 		 * And as for construction, always remove it, even if the setting is not set, in order to avoid the
 		 * need of recalculation */
 		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;
 		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, SVW_PLANES);

0 comments (0 inline, 0 general)