mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14749) -Codechange: replace a few wrapper functions that only called delete by a direct delete instead.

release/0.7
rubidium 2008-12-26 21:16:15 +00:00
parent 3ebe66a5e4
commit c2466d9571
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/aircraft_cmd.cpp
View File

@ -460,11 +460,6 @@ CommandCost CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
} }
static void DoDeleteAircraft(Vehicle *v)
{
delete v;
}
/** Sell an aircraft. /** Sell an aircraft.
* @param tile unused * @param tile unused
* @param flags for command type * @param flags for command type
@ -486,9 +481,7 @@ CommandCost CmdSellAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
CommandCost ret(EXPENSES_NEW_VEHICLES, -v->value); CommandCost ret(EXPENSES_NEW_VEHICLES, -v->value);
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
// Invalidate depot delete v;
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
DoDeleteAircraft(v);
} }
return ret; return ret;
@ -1235,9 +1228,7 @@ static void HandleCrashedAircraft(Vehicle *v)
CLRBITS(st->airport_flags, RUNWAY_IN2_block); // intercontinental CLRBITS(st->airport_flags, RUNWAY_IN2_block); // intercontinental
} }
MarkSingleVehicleDirty(v); delete v;
DoDeleteAircraft(v);
} }
} }

25
src/disaster_cmd.cpp
View File

@ -146,11 +146,6 @@ static void InitializeDisasterVehicle(Vehicle *v, int x, int y, byte z, Directio
MarkSingleVehicleDirty(v); MarkSingleVehicleDirty(v);
} }
static void DeleteDisasterVeh(Vehicle *v)
{
delete v;
}
static void SetDisasterVehiclePos(Vehicle *v, int x, int y, byte z) static void SetDisasterVehiclePos(Vehicle *v, int x, int y, byte z)
{ {
Vehicle *u; Vehicle *u;
@ -241,7 +236,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
} }
} }
if (v->y_pos >= ((int)MapSizeY() + 9) * TILE_SIZE - 1) DeleteDisasterVeh(v); if (v->y_pos >= ((int)MapSizeY() + 9) * TILE_SIZE - 1) delete v;
return; return;
} }
@ -259,7 +254,7 @@ static void DisasterTick_Zeppeliner(Vehicle *v)
} }
SetDisasterVehiclePos(v, v->x_pos, v->y_pos, v->z_pos); SetDisasterVehiclePos(v, v->x_pos, v->y_pos, v->z_pos);
DeleteDisasterVeh(v); delete v;
return; return;
} }
@ -338,12 +333,12 @@ static void DisasterTick_Ufo(Vehicle *v)
} }
} }
DeleteDisasterVeh(v); delete v;
} else { } else {
/* Target a vehicle */ /* Target a vehicle */
u = GetVehicle(v->dest_tile); u = GetVehicle(v->dest_tile);
if (u->type != VEH_ROAD || !IsRoadVehFront(u)) { if (u->type != VEH_ROAD || !IsRoadVehFront(u)) {
DeleteDisasterVeh(v); delete v;
return; return;
} }
@ -382,7 +377,7 @@ static void DisasterTick_Ufo(Vehicle *v)
if (v->age > 50) { if (v->age > 50) {
CreateEffectVehicleRel(v, 0, 7, 8, EV_EXPLOSION_LARGE); CreateEffectVehicleRel(v, 0, 7, 8, EV_EXPLOSION_LARGE);
SndPlayVehicleFx(SND_12_EXPLOSION, v); SndPlayVehicleFx(SND_12_EXPLOSION, v);
DeleteDisasterVeh(v); delete v;
} }
} }
} }
@ -417,7 +412,7 @@ static void DisasterTick_Airplane(Vehicle *v)
SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);
if (gp.x < (-10 * TILE_SIZE)) { if (gp.x < (-10 * TILE_SIZE)) {
DeleteDisasterVeh(v); delete v;
return; return;
} }
@ -490,7 +485,7 @@ static void DisasterTick_Helicopter(Vehicle *v)
SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);
if (gp.x > (int)MapSizeX() * TILE_SIZE + 9 * TILE_SIZE - 1) { if (gp.x > (int)MapSizeX() * TILE_SIZE + 9 * TILE_SIZE - 1) {
DeleteDisasterVeh(v); delete v;
return; return;
} }
@ -611,7 +606,7 @@ static void DisasterTick_Big_Ufo(Vehicle *v)
u = new DisasterVehicle(); u = new DisasterVehicle();
if (u == NULL) { if (u == NULL) {
DeleteDisasterVeh(v); delete v;
return; return;
} }
@ -671,7 +666,7 @@ static void DisasterTick_Big_Ufo_Destroyer(Vehicle *v)
SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos); SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);
if (gp.x > (int)MapSizeX() * TILE_SIZE + 9 * TILE_SIZE - 1) { if (gp.x > (int)MapSizeX() * TILE_SIZE + 9 * TILE_SIZE - 1) {
DeleteDisasterVeh(v); delete v;
return; return;
} }
@ -683,7 +678,7 @@ static void DisasterTick_Big_Ufo_Destroyer(Vehicle *v)
CreateEffectVehicleRel(u, 0, 7, 8, EV_EXPLOSION_LARGE); CreateEffectVehicleRel(u, 0, 7, 8, EV_EXPLOSION_LARGE);
SndPlayVehicleFx(SND_12_EXPLOSION, u); SndPlayVehicleFx(SND_12_EXPLOSION, u);
DeleteDisasterVeh(u); delete u;
for (i = 0; i != 80; i++) { for (i = 0; i != 80; i++) {
uint32 r = Random(); uint32 r = Random();