--- a/src/train_cmd.cpp Fri Aug 03 18:34:47 2007 +0000
+++ b/src/train_cmd.cpp Fri Aug 03 19:36:00 2007 +0000
@@ -518,7 +518,7 @@
memset(&vl, 0, sizeof(vl));
- if (!AllocateVehicles(vl, num_vehicles))
+ if (!Vehicle::AllocateList(vl, num_vehicles))
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
if (flags & DC_EXEC) {
@@ -686,7 +686,7 @@
memset(&vl, 0, sizeof(vl));
- if (!AllocateVehicles(vl, num_vehicles))
+ if (!Vehicle::AllocateList(vl, num_vehicles))
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
Vehicle *v = vl[0];
@@ -1253,7 +1253,7 @@
if (flags & DC_EXEC) {
UnlinkWagon(rear, first);
DeleteDepotHighlightOfVehicle(rear);
- DeleteVehicle(rear);
+ delete rear;
}
}
@@ -1308,7 +1308,7 @@
if (flags & DC_EXEC) {
first = UnlinkWagon(v, first);
DeleteDepotHighlightOfVehicle(v);
- DeleteVehicle(v);
+ delete v;
/* 4 If the second wagon was an engine, update it to front_engine
* which UnlinkWagon() has changed to TS_Free_Car */
@@ -1367,7 +1367,7 @@
if (flags & DC_EXEC) {
first = UnlinkWagon(rear, first);
DeleteDepotHighlightOfVehicle(rear);
- DeleteVehicle(rear);
+ delete rear;
}
}
} else if (v->u.rail.other_multiheaded_part != NULL) {
@@ -1380,7 +1380,7 @@
if (flags & DC_EXEC) {
first = UnlinkWagon(v, first);
DeleteDepotHighlightOfVehicle(v);
- DeleteVehicle(v);
+ delete v;
RemoveVehicleFromGroup(v);
}
}
@@ -3039,7 +3039,7 @@
BeginVehicleMove(v);
EndVehicleMove(v);
- DeleteVehicle(v);
+ delete v;
if (v->u.rail.track != TRACK_BIT_DEPOT && v->u.rail.track != TRACK_BIT_WORMHOLE)
SetSignalsOnBothDir(v->tile, FIND_FIRST_BIT(v->u.rail.track));
@@ -3329,8 +3329,7 @@
TrainLocoHandler(this, true);
} else if (IsFreeWagon(this) && HASBITS(this->vehstatus, VS_CRASHED)) {
/* Delete flooded standalone wagon */
- if (++this->u.rail.crash_anim_pos >= 4400)
- DeleteVehicle(this);
+ if (++this->u.rail.crash_anim_pos >= 4400) delete this;
}
}