cpp/openttd-patchpack/source Changeset - r15012:f19fe03ea1c7

Changeset - r15012:f19fe03ea1c7

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

frosch - 14 years ago 2010-04-14 20:28:37
frosch@openttd.org

(svn r19637) -Codechange: Pass complete TransportType to CmdBuildTunnel.

4 files changed with 27 insertions and 17 deletions:

src/ai/api/ai_tunnel.cpp

src/rail_gui.cpp

src/road_gui.cpp

src/tunnelbridge_cmd.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_tunnel.cpp

➞

Show inline comments

@@ @@ -74,16 +74,16 @@ static void _DoCommandReturnBuildTunnel1 @@
 	EnforcePrecondition(false, ::IsValidTile(start));
 	EnforcePrecondition(false, vehicle_type == AIVehicle::VT_RAIL || vehicle_type == AIVehicle::VT_ROAD);
 	EnforcePrecondition(false, vehicle_type != AIVehicle::VT_RAIL || AIRail::IsRailTypeAvailable(AIRail::GetCurrentRailType()));
 	uint type = 0;
 	if (vehicle_type == AIVehicle::VT_ROAD) {
-		type |= (TRANSPORT_ROAD << 9);
+		type |= (TRANSPORT_ROAD << 8);
 		type |= ::RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType());
 	} else {
-		type |= (TRANSPORT_RAIL << 9);
+		type |= (TRANSPORT_RAIL << 8);
 		type |= AIRail::GetCurrentRailType();
+	}
 	/* For rail we do nothing special */
 	if (vehicle_type == AIVehicle::VT_RAIL) {
 		return AIObject::DoCommand(start, type, 0, CMD_BUILD_TUNNEL);

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -274,13 +274,13 @@ void CcBuildRailTunnel(const CommandCost @@
 		SetRedErrorSquare(_build_tunnel_endtile);
+	}
+}
 static void PlaceRail_Tunnel(TileIndex tile)
+{
 	DoCommandP(tile, _cur_railtype, 0, CMD_BUILD_TUNNEL | CMD_MSG(STR_ERROR_CAN_T_BUILD_TUNNEL_HERE), CcBuildRailTunnel);
+	DoCommandP(tile, _cur_railtype | (TRANSPORT_RAIL << 8), 0, CMD_BUILD_TUNNEL | CMD_MSG(STR_ERROR_CAN_T_BUILD_TUNNEL_HERE), CcBuildRailTunnel);
+}
 static void PlaceRail_ConvertRail(TileIndex tile)
+{
 	VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_CONVERT_RAIL);
+}
@@ @@ -818,13 +818,13 @@ struct BuildRailToolbarWindow : Window { @@
 		DeleteWindowById(WC_SELECT_STATION, 0);
 		DeleteWindowByClass(WC_BUILD_BRIDGE);
+	}
 	virtual void OnPlacePresize(Point pt, TileIndex tile)
+	{
 		DoCommand(tile, _cur_railtype, 0, DC_AUTO, CMD_BUILD_TUNNEL);
+		DoCommand(tile, _cur_railtype | (TRANSPORT_RAIL << 8), 0, DC_AUTO, CMD_BUILD_TUNNEL);
 		VpSetPresizeRange(tile, _build_tunnel_endtile == 0 ? tile : _build_tunnel_endtile);
+	}
 	virtual EventState OnCTRLStateChange()
+	{
 		/* do not toggle Remove button by Ctrl when placing station */

src/road_gui.cpp

➞

Show inline comments

@@ @@ -179,13 +179,13 @@ static const RoadTypeInfo _road_type_inf @@
 		SPR_CURSOR_AUTOTRAM,
 	},
 };
 static void PlaceRoad_Tunnel(TileIndex tile)
+{
-	DoCommandP(tile, 0x200 | RoadTypeToRoadTypes(_cur_roadtype), 0, CMD_BUILD_TUNNEL | CMD_MSG(STR_ERROR_CAN_T_BUILD_TUNNEL_HERE), CcBuildRoadTunnel);
+	DoCommandP(tile, RoadTypeToRoadTypes(_cur_roadtype) | (TRANSPORT_ROAD << 8), 0, CMD_BUILD_TUNNEL | CMD_MSG(STR_ERROR_CAN_T_BUILD_TUNNEL_HERE), CcBuildRoadTunnel);
+}
 static void BuildRoadOutsideStation(TileIndex tile, DiagDirection direction)
+{
 	tile += TileOffsByDiagDir(direction);
 	/* if there is a roadpiece just outside of the station entrance, build a connecting route */
@@ @@ -685,13 +685,13 @@ struct BuildRoadToolbarWindow : Window { @@
+			}
+		}
+	}
 	virtual void OnPlacePresize(Point pt, TileIndex tile)
+	{
-		DoCommand(tile, 0x200 | RoadTypeToRoadTypes(_cur_roadtype), 0, DC_AUTO, CMD_BUILD_TUNNEL);
+		DoCommand(tile, RoadTypeToRoadTypes(_cur_roadtype) | (TRANSPORT_ROAD << 8), 0, DC_AUTO, CMD_BUILD_TUNNEL);
 		VpSetPresizeRange(tile, _build_tunnel_endtile == 0 ? tile : _build_tunnel_endtile);
+	}
 	virtual EventState OnCTRLStateChange()
+	{
 		if (RoadToolbar_CtrlChanged(this)) return ES_HANDLED;

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -479,27 +479,37 @@ CommandCost CmdBuildBridge(TileIndex end @@
+}
 /** Build Tunnel.
  * @param start_tile start tile of tunnel
  * @param flags type of operation
  * @param p1 railtype or roadtypes. bit 9 set means road tunnel
  * @param p1 bit 0-3 railtype or roadtypes
  *           bit 8-9 transport type
  * @param p2 unused
  * @param text unused
  * @return the cost of this operation or an error
  */
 CommandCost CmdBuildTunnel(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
+{
-	TransportType transport_type = (TransportType)GB(p1, 9, 1);
+	TransportType transport_type = (TransportType)GB(p1, 8, 2);
 	RailType railtype = INVALID_RAILTYPE;
 	RoadTypes rts = ROADTYPES_NONE;
 	_build_tunnel_endtile = 0;
 	if (transport_type == TRANSPORT_RAIL) {
 		if (!ValParamRailtype((RailType)p1)) return CMD_ERROR;
 	} else {
 		const RoadTypes rts = (RoadTypes)GB(p1, 0, 2);
 		if (!HasExactlyOneBit(rts) || !HasRoadTypesAvail(_current_company, rts)) return CMD_ERROR;
 	switch (transport_type) {
 		case TRANSPORT_RAIL:
 			railtype = (RailType)GB(p1, 0, 4);
 			if (!ValParamRailtype(railtype)) return CMD_ERROR;
 			break;
 		case TRANSPORT_ROAD:
 			rts = (RoadTypes)GB(p1, 0, 2);
 			if (!HasExactlyOneBit(rts) || !HasRoadTypesAvail(_current_company, rts)) return CMD_ERROR;
 			break;
 		default: return CMD_ERROR;
+	}
 	uint start_z;
 	uint end_z;
 	Slope start_tileh = GetTileSlope(start_tile, &start_z);
 	DiagDirection direction = GetInclinedSlopeDirection(start_tileh);
@@ @@ -581,19 +591,19 @@ CommandCost CmdBuildTunnel(TileIndex sta @@
+	}
 	cost.AddCost(_price[PR_BUILD_TUNNEL]);
 	cost.AddCost(ret);
 	if (flags & DC_EXEC) {
 		if (transport_type == TRANSPORT_RAIL) {
 			MakeRailTunnel(start_tile, _current_company, direction,                 (RailType)GB(p1, 0, 4));
 			MakeRailTunnel(end_tile,   _current_company, ReverseDiagDir(direction), (RailType)GB(p1, 0, 4));
 			MakeRailTunnel(start_tile, _current_company, direction,                 railtype);
 			MakeRailTunnel(end_tile,   _current_company, ReverseDiagDir(direction), railtype);
 			AddSideToSignalBuffer(start_tile, INVALID_DIAGDIR, _current_company);
 			YapfNotifyTrackLayoutChange(start_tile, DiagDirToDiagTrack(direction));
 		} else {
 			MakeRoadTunnel(start_tile, _current_company, direction,                 (RoadTypes)GB(p1, 0, 2));
 			MakeRoadTunnel(end_tile,   _current_company, ReverseDiagDir(direction), (RoadTypes)GB(p1, 0, 2));
 			MakeRoadTunnel(start_tile, _current_company, direction,                 rts);
 			MakeRoadTunnel(end_tile,   _current_company, ReverseDiagDir(direction), rts);
+		}
+	}
 	return cost;
+}

0 comments (0 inline, 0 general)