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

(svn r6157) -Codechange: DeleteVehicle removes a vehicle from the pool

Browse Source 
-Codechange: DestroyVehicle is called by DeleteVehicle to remove all things where a vehicle depends on.
  Last 2 changes to prepare for new pool system. Not pretty now, will be soon.
This commit is contained in:
truelight
2006-08-26 20:09:25 +00:00
parent a241ec82c9
commit 7f84bcc917
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vehicle.c
View File

@@ -528,26 +528,21 @@ uint CountVehiclesInChain(const Vehicle* v)
return count;
}
void DeleteVehicle(Vehicle *v)
void DestroyVehicle(Vehicle *v)
{
Vehicle *u;
bool has_artic_part = false;
DeleteVehicleNews(v->index, INVALID_STRING_ID);
do {
u = v->next;
has_artic_part = EngineHasArticPart(v);
DeleteName(v->string_id);
if (v->type == VEH_Road) ClearSlot(v);
v->type = 0;
UpdateVehiclePosHash(v, INVALID_COORD, 0);
v->next_hash = INVALID_VEHICLE;
DeleteName(v->string_id);
if (v->type == VEH_Road) ClearSlot(v);
if (v->orders != NULL)
DeleteVehicleOrders(v);
v = u;
} while (v != NULL && has_artic_part);
UpdateVehiclePosHash(v, INVALID_COORD, 0);
v->next_hash = INVALID_VEHICLE;
if (v->orders != NULL) DeleteVehicleOrders(v);
/* Now remove any artic part. This will trigger an other
* destroy vehicle, which on his turn can remove any
* other artic parts. */
if (EngineHasArticPart(v)) DeleteVehicle(v->next);
}
void DeleteVehicleChain(Vehicle *v)