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

(svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible

Browse Source
This commit is contained in:
truebrain
2012-01-02 13:44:30 +00:00
parent 19004a77f8
commit 0d929e877f
11 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/disaster_cmd.cpp
View File

@@ -149,8 +149,7 @@ static void InitializeDisasterVehicle(DisasterVehicle *v, int x, int y, int z, D
v->current_order.Free();
DisasterVehicleUpdateImage(v);
VehicleMove(v, false);
MarkSingleVehicleDirty(v);
VehicleUpdatePositionAndViewport(v);
}
static void SetDisasterVehiclePos(DisasterVehicle *v, int x, int y, int z)
@@ -161,7 +160,7 @@ static void SetDisasterVehiclePos(DisasterVehicle *v, int x, int y, int z)
v->tile = TileVirtXY(x, y);
DisasterVehicleUpdateImage(v);
VehicleMove(v, true);
VehicleUpdatePositionAndViewport(v);
DisasterVehicle *u = v->Next();
if (u != NULL) {
@@ -175,13 +174,13 @@ static void SetDisasterVehiclePos(DisasterVehicle *v, int x, int y, int z)
u->direction = v->direction;
DisasterVehicleUpdateImage(u);
VehicleMove(u, true);
VehicleUpdatePositionAndViewport(u);
if ((u = u->Next()) != NULL) {
u->x_pos = x;
u->y_pos = y;
u->z_pos = z + 5;
VehicleMove(u, true);
VehicleUpdatePositionAndViewport(u);
}
}
}
@@ -479,7 +478,7 @@ static bool DisasterTick_Helicopter_Rotors(DisasterVehicle *v)
if (++v->cur_image > SPR_ROTOR_MOVING_3) v->cur_image = SPR_ROTOR_MOVING_1;
VehicleMove(v, true);
VehicleUpdatePositionAndViewport(v);
return true;
}