Mercurial > hg > openttd

changeset 16420:f74d1996f90c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21136) -Fix [FS#4213]: bridge speed limits should apply to all wagons of a vehicle, not just the head of the vehicle
author rubidium <rubidium@openttd.org>
date Wed, 10 Nov 2010 20:15:48 +0000
parents 4213eba9a351
children 13aa83c84137
files src/roadveh_cmd.cpp src/train_cmd.cpp src/tunnelbridge_cmd.cpp
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -669,7 +669,8 @@
 
 	/* Apply bridge speed limit */
 	if (v->state == RVSB_WORMHOLE && !(v->vehstatus & VS_HIDDEN)) {
-		v->cur_speed = min(v->cur_speed, GetBridgeSpec(GetBridgeType(v->tile))->speed * 2);
+		RoadVehicle *first = v->First();
+		first->cur_speed = min(first->cur_speed, GetBridgeSpec(GetBridgeType(v->tile))->speed * 2);
 	}
 
 	/* Update statusbar only if speed has changed to save CPU time */
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3296,8 +3296,8 @@
 			 * - for tunnels, only the part when the vehicle is not visible (part of enter/exit tile too)
 			 * - for bridges, only the middle part - without the bridge heads */
 			if (!(v->vehstatus & VS_HIDDEN)) {
-				v->cur_speed =
-					min(v->cur_speed, GetBridgeSpec(GetBridgeType(v->tile))->speed);
+				Train *first = v->First();
+				first->cur_speed = min(first->cur_speed, GetBridgeSpec(GetBridgeType(v->tile))->speed);
 			}
 
 			if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -1562,13 +1562,13 @@
 			}
 		}
 	} else { // IsBridge(tile)
-
-		if (v->IsPrimaryVehicle() && v->type != VEH_SHIP) {
+		if (v->type != VEH_SHIP) {
 			/* modify speed of vehicle */
 			uint16 spd = GetBridgeSpec(GetBridgeType(tile))->speed;
 
 			if (v->type == VEH_ROAD) spd *= 2;
-			if (v->cur_speed > spd) v->cur_speed = spd;
+			Vehicle *first = v->First();
+			first->cur_speed = min(first->cur_speed, spd);
 		}
 
 		if (vdir == dir) {