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

(svn r10799) -Fix: only calling QuickFree and not the destructor on pool cleanups might cause memory leaks due to the way C++ works.

Browse Source
This commit is contained in:
rubidium
2007-08-05 21:20:55 +00:00
parent dfe851e02f
commit 8f719a7b2d
15 changed files with 48 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vehicle.cpp
View File

@@ -564,6 +564,8 @@ bool IsEngineCountable(const Vehicle *v)
void Vehicle::PreDestructor()
{
if (CleaningPool()) return;
if (IsValidStationID(this->last_station_visited)) {
GetStation(this->last_station_visited)->loading_vehicles.remove(this);
@@ -579,7 +581,6 @@ void Vehicle::PreDestructor()
if (this->IsPrimaryVehicle()) DecreaseGroupNumVehicle(this->group_id);
}
this->QuickFree();
if (this->type == VEH_ROAD) ClearSlot(this);
if (this->type != VEH_TRAIN || (this->type == VEH_TRAIN && (IsFrontEngine(this) || IsFreeWagon(this)))) {
@@ -599,6 +600,10 @@ void Vehicle::PreDestructor()
Vehicle::~Vehicle()
{
DeleteName(this->string_id);
if (CleaningPool()) return;
UpdateVehiclePosHash(this, INVALID_COORD, 0);
this->next_hash = NULL;
this->next_new_hash = NULL;
@@ -608,11 +613,6 @@ Vehicle::~Vehicle()
new (this) InvalidVehicle();
}
void Vehicle::QuickFree()
{
DeleteName(this->string_id);
}
/**
* Deletes all vehicles in a chain.
* @param v The first vehicle in the chain.