Mercurial > hg > openttd

changeset 5852:ef3f75424ca4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8426) -Fix Slightly simplify the code which determines whether to build a rail or a road bridge
author tron <tron@openttd.org>
date Sat, 27 Jan 2007 10:08:08 +0000
parents 295e46d828ff
children 8f3afb2f2040
files src/tunnelbridge_cmd.cpp
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -174,7 +174,6 @@
 int32 CmdBuildBridge(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	int bridge_type;
-	TransportType transport;
 	RailType railtype;
 	uint x;
 	uint y;
@@ -202,12 +201,10 @@
 
 	// type of bridge
 	if (HASBIT(p2, 15)) {
-		railtype = RAILTYPE_BEGIN; // ??
-		transport = TRANSPORT_ROAD;
+		railtype = INVALID_RAILTYPE; // road bridge
 	} else {
 		if (!ValParamRailtype(GB(p2, 8, 8))) return CMD_ERROR;
 		railtype = (RailType)GB(p2, 8, 8);
-		transport = TRANSPORT_RAIL;
 	}
 
 	x = TileX(end_tile);
@@ -305,7 +302,7 @@
 	if (flags & DC_EXEC) {
 		DiagDirection dir = AxisToDiagDir(direction);
 
-		if (transport == TRANSPORT_RAIL) {
+		if (railtype != INVALID_RAILTYPE) {
 			MakeRailBridgeRamp(tile_start, _current_player, bridge_type, dir, railtype);
 			MakeRailBridgeRamp(tile_end,   _current_player, bridge_type, ReverseDiagDir(dir), railtype);
 		} else {