cpp/openttd-patchpack/source Changeset - r15853:61b6cb670877

Changeset - r15853:61b6cb670877

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

rubidium - 14 years ago 2010-08-18 18:52:16
rubidium@openttd.org

(svn r20545) -Codechange: make sure an OrderBackup gets cleared when the depot it belongs to gets removed, the depot window gets closed or when another vehicle gets sold in a depot

6 files changed with 42 insertions and 25 deletions:

src/depot.cpp

src/depot_gui.cpp

src/order_backup.cpp

src/order_backup.h

src/station_cmd.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/depot.cpp

➞

Show inline comments

@@ @@ -8,12 +8,13 @@ @@
  */
 /** @file depot.cpp Handling of depots. */
 #include "stdafx.h"
 #include "depot_base.h"
 #include "order_backup.h"
 #include "order_func.h"
 #include "window_func.h"
 #include "core/pool_func.hpp"
 #include "vehicle_gui.h"
 DepotPool _depot_pool("Depot");
@@ @@ -28,12 +29,13 @@ Depot::~Depot() @@
 	/* Clear the depot from all order-lists */
 	RemoveOrderFromAllVehicles(OT_GOTO_DEPOT, this->index);
 	/* Delete the depot-window */
 	DeleteWindowById(WC_VEHICLE_DEPOT, this->xy);
 	OrderBackup::Reset(this->xy);
 	/* Delete the depot list */
 	WindowNumber wno = (this->index << 16) | VLW_DEPOT_LIST | GetTileOwner(this->xy);
 	switch (GetTileType(this->xy)) {
 		default: break; // It can happen there is no depot here anymore (TTO/TTD savegames)
 		case MP_RAILWAY: DeleteWindowById(WC_TRAINS_LIST,  wno | (VEH_TRAIN << 11)); break;

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -258,12 +258,13 @@ struct DepotWindow : Window { @@
 		OrderBackup::Reset();
+	}
 	~DepotWindow()
+	{
 		DeleteWindowById(WC_BUILD_VEHICLE, this->window_number);
 		OrderBackup::Reset(this->window_number);
+	}
 	/**
 	 * Draw a vehicle in the depot window in the box with the top left corner at x,y.
 	 * @param v     Vehicle to draw.
 	 * @param left  Left side of the box to draw in.
@@ @@ -975,18 +976,15 @@ struct DepotWindow : Window { @@
 				this->SetDirty();
 				int sell_cmd = (v->type == VEH_TRAIN && (widget == DEPOT_WIDGET_SELL_CHAIN || _ctrl_pressed)) ? 1 : 0;
 				bool is_engine = (v->type != VEH_TRAIN || Train::From(v)->IsFrontEngine());
 				if (is_engine) {
 					OrderBackup::Reset();
 					new OrderBackup(v);
+				}
 				if (is_engine) OrderBackup::Backup(v);
 				if (!DoCommandP(v->tile, v->index | sell_cmd << 16, 0, GetCmdSellVeh(v->type)) && is_engine) OrderBackup::Reset();
+				if (!DoCommandP(v->tile, v->index | sell_cmd << 16, 0, GetCmdSellVeh(v->type)) && is_engine) OrderBackup::Reset(this->window_number);
 				break;
+			}
 			default:
 				this->sel = INVALID_VEHICLE;
 				this->SetDirty();

src/order_backup.cpp

➞

Show inline comments

@@ @@ -58,13 +58,13 @@ OrderBackup::OrderBackup(const Vehicle * @@
+		}
 		/* End the list with an empty order */
 		dest->Free();
+	}
+}
-void OrderBackup::RestoreTo(const Vehicle *v)
+void OrderBackup::DoRestore(const Vehicle *v)
+{
 	/* If we have a custom name, process that */
 	if (this->name != NULL) DoCommandP(0, v->index, 0, CMD_RENAME_VEHICLE, NULL, this->name);
 	/* If we had shared orders, recover that */
 	if (this->clone != NULL) {
@@ @@ -106,28 +106,37 @@ void OrderBackup::RestoreTo(const Vehicl @@
 	/* Restore vehicle order-index and service interval */
 	DoCommandP(0, v->index, this->orderindex | (this->service_interval << 16), CMD_RESTORE_ORDER_INDEX);
 	/* Restore vehicle group */
 	DoCommandP(0, this->group, v->index, CMD_ADD_VEHICLE_GROUP);
 	delete this;
+}
 /* static */ OrderBackup *OrderBackup::GetByTile(TileIndex t)
 /* static */ void OrderBackup::Backup(const Vehicle *v)
+{
 	OrderBackup::Reset();
 	new OrderBackup(v);
+}
 /* static */ void OrderBackup::Restore(const Vehicle *v)
+{
 	OrderBackup *ob;
 	FOR_ALL_ORDER_BACKUPS(ob) {
 		if (ob->tile == t) return ob;
 		if (v->tile != ob->tile) continue;
 		ob->DoRestore(v);
 		delete ob;
+	}
 	return NULL;
+}
 /* static */ void OrderBackup::Reset()
+/* static */ void OrderBackup::Reset(TileIndex t)
+{
 	_order_backup_pool.CleanPool();
 	OrderBackup *ob;
 	FOR_ALL_ORDER_BACKUPS(ob) {
 		if (t == INVALID_TILE || t == ob->tile) delete ob;
+	}
+}
 /* static */ void OrderBackup::ClearGroup(GroupID group)
+{
 	OrderBackup *ob;
 	FOR_ALL_ORDER_BACKUPS(ob) {

src/order_backup.h

➞

Show inline comments

@@ @@ -40,40 +40,47 @@ private: @@
 	char *name;                ///< The custom name of the vehicle.
 	const Vehicle *clone;      ///< Vehicle this vehicle was a clone of.
 	VehicleOrderID orderindex; ///< The order-index the vehicle had.
 	Order *orders;             ///< The actual orders if the vehicle was not a clone.
 public:
 	/**
 	 * Create an order backup for the given vehicle.
 	 * @param v The vehicle to make a backup of.
 	 */
 	OrderBackup(const Vehicle *v);
 	/**
 	 * Restore the data of this order to the given vehicle.
 	 * @param v The vehicle to restore to.
 	 */
 	void DoRestore(const Vehicle *v);
 public:
 	/** Free everything that is allocated. */
 	~OrderBackup();
 	/**
 	 * Create an order backup for the given vehicle.
 	 * @param v The vehicle to make a backup of.
 	 * @note Will automatically remove any previous backups of this user.
 	 */
 	static void Backup(const Vehicle *v);
 	/**
 	 * Restore the data of this order to the given vehicle.
 	 * @param v The vehicle to restore to.
 	 * @note After restoration the backup will automatically be removed.
 	 */
 	void RestoreTo(const Vehicle *v);
 	/**
 	 * Get the order backup associated with a given tile.
 	 * @param t The tile to get the order backup for.
 	 * @return The order backup, or NULL if it doesn't exist.
 	 */
 	static OrderBackup *GetByTile(TileIndex t);
 	static void Restore(const Vehicle *v);
 	/**
 	 * Reset the OrderBackups.
 	 * @param tile The tile of the order backup.
 	 */
 	static void Reset();
+	static void Reset(TileIndex tile = INVALID_TILE);
 	/**
 	 * Clear the group of all backups having this group ID.
 	 * @param group The group to clear.
 	 */
 	static void ClearGroup(GroupID group);

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -46,12 +46,13 @@ @@
 #include "debug.h"
 #include "core/random_func.hpp"
 #include "company_base.h"
 #include "newgrf.h"
 #include "table/airporttile_ids.h"
 #include "newgrf_airporttiles.h"
 #include "order_backup.h"
 #include "table/strings.h"
 /**
  * Check whether the given tile is a hangar.
  * @param t the tile to of whether it is a hangar.
@@ @@ -2284,12 +2285,13 @@ static CommandCost RemoveAirport(TileInd @@
 		CommandCost ret = EnsureNoVehicleOnGround(tile_cur);
 		if (ret.Failed()) return ret;
 		cost.AddCost(_price[PR_CLEAR_STATION_AIRPORT]);
 		if (flags & DC_EXEC) {
 			if (IsHangarTile(tile_cur)) OrderBackup::Reset(tile_cur);
 			DeleteAnimatedTile(tile_cur);
 			DoClearSquare(tile_cur);
 			DeleteNewGRFInspectWindow(GSF_AIRPORTTILES, tile_cur);
+		}
+	}

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -2370,10 +2370,9 @@ void StopGlobalFollowVehicle(const Vehic @@
  */
 void CcBuildPrimaryVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+{
 	if (result.Failed()) return;
 	const Vehicle *v = Vehicle::Get(_new_vehicle_id);
 	OrderBackup *ob = OrderBackup::GetByTile(v->tile);
 	if (ob != NULL) ob->RestoreTo(v);
 	OrderBackup::Restore(v);
 	ShowVehicleViewWindow(v);
+}

0 comments (0 inline, 0 general)