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

(svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove.

Browse Source
This commit is contained in:
rubidium
2009-03-11 20:43:14 +00:00
parent 48c8cdfd84
commit 655b0ccc2e
10 changed files with 70 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ship_cmd.cpp
View File

@@ -588,8 +588,6 @@ static void ShipController(Vehicle *v)
if (!ShipAccelerate(v)) return;
BeginVehicleMove(v);
GetNewVehiclePosResult gp = GetNewVehiclePos(v);
if (v->u.ship.state != TRACK_BIT_WORMHOLE) {
/* Not on a bridge */
@@ -683,8 +681,7 @@ static void ShipController(Vehicle *v)
if (!IsTileType(gp.new_tile, MP_TUNNELBRIDGE) || !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
v->x_pos = gp.x;
v->y_pos = gp.y;
VehiclePositionChanged(v);
if (!(v->vehstatus & VS_HIDDEN)) EndVehicleMove(v);
VehicleMove(v, !(v->vehstatus & VS_HIDDEN));
return;
}
}
@@ -698,8 +695,7 @@ static void ShipController(Vehicle *v)
getout:
v->UpdateDeltaXY(dir);
v->cur_image = v->GetImage(dir);
VehiclePositionChanged(v);
EndVehicleMove(v);
VehicleMove(v, true);
return;
reverse_direction:
@@ -803,7 +799,7 @@ CommandCost CmdBuildShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
v->cargo_cap = GetVehicleProperty(v, 0x0D, svi->capacity);
VehiclePositionChanged(v);
VehicleMove(v, false);
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
InvalidateWindowClassesData(WC_SHIPS_LIST, 0);