From 0d929e877faf9572a80803db382ab973702e02c0 Mon Sep 17 00:00:00 2001 From: truebrain Date: Mon, 2 Jan 2012 13:44:30 +0000 Subject: (svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible --- src/ship_cmd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ship_cmd.cpp') diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 00bc770d8..2a65dfcf4 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -588,7 +588,8 @@ static void ShipController(Ship *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; - VehicleMove(v, !(v->vehstatus & VS_HIDDEN)); + VehicleUpdatePosition(v); + if ((v->vehstatus & VS_HIDDEN) == 0) VehicleUpdateViewport(v, true); return; } } @@ -680,7 +681,7 @@ CommandCost CmdBuildShip(TileIndex tile, DoCommandFlag flags, const Engine *e, u v->InvalidateNewGRFCacheOfChain(); - VehicleMove(v, false); + VehicleUpdatePosition(v); } return CommandCost(); -- cgit v1.2.3-54-g00ecf