cpp/openttd-patchpack/source Changeset - r15307:f844b2fa748c

Changeset - r15307:f844b2fa748c

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 14 years ago 2010-06-11 00:20:24
smatz@openttd.org

(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor

2 files changed with 2 insertions and 3 deletions:

src/station.cpp

src/waypoint.cpp

0 comments (0 inline, 0 general)

src/station.cpp

➞

Show inline comments

@@ @@ -42,12 +42,14 @@ BaseStation::~BaseStation() @@
 	if (!Company::IsValidID(owner)) owner = _local_company;
 	WindowNumber wno = (this->index << 16) | VLW_STATION_LIST | owner;
 	DeleteWindowById(WC_TRAINS_LIST, wno | (VEH_TRAIN << 11));
 	DeleteWindowById(WC_ROADVEH_LIST, wno | (VEH_ROAD << 11));
 	DeleteWindowById(WC_SHIPS_LIST, wno | (VEH_SHIP << 11));
 	DeleteWindowById(WC_AIRCRAFT_LIST, wno | (VEH_AIRCRAFT << 11));
 	this->sign.MarkDirty();
+}
 Station::Station(TileIndex tile) :
 	SpecializedStation<Station, false>(tile),
 	bus_station(INVALID_TILE, 0, 0),
 	truck_station(INVALID_TILE, 0, 0),
@@ @@ -85,13 +87,12 @@ Station::~Station() @@
 		/* Forget about this station if this station is removed */
 		if (v->last_station_visited == this->index) {
 			v->last_station_visited = INVALID_STATION;
+		}
+	}
 	this->sign.MarkDirty();
 	InvalidateWindowData(WC_STATION_LIST, this->owner, 0);
 	DeleteWindowById(WC_STATION_VIEW, index);
 	/* Now delete all orders that go to the station */
 	RemoveOrderFromAllVehicles(OT_GOTO_STATION, this->index);

src/waypoint.cpp

➞

Show inline comments

@@ @@ -49,9 +49,7 @@ void Waypoint::GetTileArea(TileArea *ta, @@
 Waypoint::~Waypoint()
+{
 	if (CleaningPool()) return;
 	DeleteWindowById(WC_WAYPOINT_VIEW, this->index);
 	RemoveOrderFromAllVehicles(OT_GOTO_WAYPOINT, this->index);
 	this->sign.MarkDirty();
+}

0 comments (0 inline, 0 general)