Mercurial > hg > openttd

changeset 6152:16eaa24b383f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8896) -Fix Most (i.e. 13 of 15) callers of GetNewVehiclePos() do not care for the return and the others can figure it out by inspecting the information returned in struct GetNewVehiclePosResult. Therefore remove the return value.
author tron <tron@openttd.org>
date Sun, 25 Feb 2007 10:25:25 +0000
parents dc514bd416ef
children 42ef9b98d898
files src/ship_cmd.cpp src/train_cmd.cpp src/vehicle.cpp src/vehicle.h
diffstat 4 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -692,7 +692,8 @@
 
 	BeginVehicleMove(v);
 
-	if (GetNewVehiclePos(v, &gp)) {
+	GetNewVehiclePos(v, &gp);
+	if (gp.old_tile == gp.new_tile) {
 		/* Staying in tile */
 		if (IsShipInDepot(v)) {
 			gp.x = v->x_pos;
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2887,9 +2887,10 @@
 		BeginVehicleMove(v);
 
 		GetNewVehiclePosResult gp;
+		GetNewVehiclePos(v, &gp);
 		if (v->u.rail.track != TRACK_BIT_WORMHOLE) {
 			/* Not inside tunnel */
-			if (GetNewVehiclePos(v, &gp)) {
+			if (gp.old_tile == gp.new_tile) {
 				/* Staying in the old tile */
 				if (v->u.rail.track == TRACK_BIT_DEPOT) {
 					/* Inside depot */
@@ -3039,8 +3040,6 @@
 			}
 		} else {
 			/* In tunnel or on a bridge */
-			GetNewVehiclePos(v, &gp);
-
 			if (!(v->vehstatus & VS_HIDDEN)) {
 				v->cur_speed =
 					min(v->cur_speed, GetBridge(GetBridgeType(v->tile))->speed);
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2692,7 +2692,7 @@
 }
 
 /* returns true if staying in the same tile */
-bool GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp)
+void GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp)
 {
 	static const int8 _delta_coord[16] = {
 		-1,-1,-1, 0, 1, 1, 1, 0, /* x */
@@ -2706,7 +2706,6 @@
 	gp->y = y;
 	gp->old_tile = v->tile;
 	gp->new_tile = TileVirtXY(x, y);
-	return gp->old_tile == gp->new_tile;
 }
 
 static const Direction _new_direction_table[] = {
--- a/src/vehicle.h
+++ b/src/vehicle.h
@@ -427,7 +427,7 @@
 Trackdir GetVehicleTrackdir(const Vehicle* v);
 
 /* returns true if staying in the same tile */
-bool GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp);
+void GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp);
 Direction GetDirectionTowards(const Vehicle* v, int x, int y);
 
 #define BEGIN_ENUM_WAGONS(v) do {