dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12940) -Fix [FS#1974](r12913): [autoreplace] a vehicle backup should include the cargo packets in the vehicle as well

Browse Source
This commit is contained in:
bjarni
2008-05-04 10:05:35 +00:00
parent b35100e2a9
commit 63fea0790b
5 changed files with 105 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vehicle_base.h
View File

@@ -522,9 +522,6 @@ public:
* @return the cost of the depot action.
*/
CommandCost SendToDepot(uint32 flags, DepotCommand command);
Vehicle* BackupVehicle() const;
Vehicle* RestoreBackupVehicle();
};
/**
@@ -659,15 +656,19 @@ private:
Vehicle *vehicles;
BackuppedOrders *orders;
PlayerMoneyBackup *economy;
CargoPacket *cargo_packets;
void BackupVehicle(Vehicle *v);
Vehicle* RestoreBackupVehicle(Vehicle *v, Player *p);
public:
BackuppedVehicle(bool include_orders) : vehicles(NULL), economy(NULL) {
BackuppedVehicle(bool include_orders) : vehicles(NULL), economy(NULL), cargo_packets(NULL) {
orders = include_orders ? new BackuppedOrders() : NULL;
}
~BackuppedVehicle() { free(vehicles); delete orders; delete economy; }
~BackuppedVehicle() { free(vehicles); delete orders; delete economy; free(cargo_packets); }
void Backup(const Vehicle *v, Player *p = NULL);
Vehicle *Restore(Vehicle *v);
void Backup(Vehicle *v, Player *p = NULL);
Vehicle *Restore(Vehicle *v, Player *p);
bool ContainsBackup() { return vehicles != NULL; }
};