Mercurial > hg > openttd

diff src/ship_cmd.cpp @ 11326:557dd16a7c24 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove.
author rubidium <rubidium@openttd.org>
date Wed, 11 Mar 2009 20:43:14 +0000 (2009-03-11)
parents a8ef2900d82e
children 02313cc6114e
line wrap: on
line diff
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -588,8 +588,6 @@
 
 	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 @@
 		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 @@
 getout:
 	v->UpdateDeltaXY(dir);
 	v->cur_image = v->GetImage(dir);
-	VehiclePositionChanged(v);
-	EndVehicleMove(v);
+	VehicleMove(v, true);
 	return;
 
 reverse_direction:
@@ -803,7 +799,7 @@
 
 		v->cargo_cap = GetVehicleProperty(v, 0x0D, svi->capacity);
 
-		VehiclePositionChanged(v);
+		VehicleMove(v, false);
 
 		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
 		InvalidateWindowClassesData(WC_SHIPS_LIST, 0);