summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-09-14 19:36:31 +0000
committerrubidium <rubidium@openttd.org>2008-09-14 19:36:31 +0000
commit497ded7e40f51740d2dc39fadc4643fd8469a8f9 (patch)
treed16338efa14c83560088413740253a0f577a3502 /src
parentcc16809f7158846164b4409720a59b2df28d7f6c (diff)
downloadopenttd-497ded7e40f51740d2dc39fadc4643fd8469a8f9.tar.xz
(svn r14326) -Fix: some wrong comments (Yexo)
Diffstat (limited to 'src')
-rw-r--r--src/bridge_gui.cpp8
-rw-r--r--src/tunnelbridge_cmd.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index b650b9676..bb493f70c 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -275,17 +275,17 @@ static const WindowDesc _build_bridge_desc = {
* @parma start The start tile of the bridge
* @param end The end tile of the bridge
* @param transport_type The transport type
- * @param bridge_type The bridge type
+ * @param road_rail_type The road/rail type
*/
-void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transport_type, byte bridge_type)
+void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transport_type, byte road_rail_type)
{
DeleteWindowById(WC_BUILD_BRIDGE, 0);
/* Data type for the bridge.
* Bit 16,15 = transport type,
- * 14..8 = road/rail pieces,
+ * 14..8 = road/rail types,
* 7..0 = type of bridge */
- uint32 type = (transport_type << 15) | (bridge_type << 8);
+ uint32 type = (transport_type << 15) | (road_rail_type << 8);
/* only query bridge building possibility once, result is the same for all bridges!
* returns CMD_ERROR on failure, and price on success */
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index 9abe9435f..914625237 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -182,9 +182,9 @@ bool CheckBridge_Stuff(BridgeType bridge_type, uint bridge_len, uint32 flags)
* @param flags type of operation
* @param p1 packed start tile coords (~ dx)
* @param p2 various bitstuffed elements
- * - p2 = (bit 0- 7) - bridge type (hi bh)
- * - p2 = (bit 8-..) - rail type or road types.
- * - p2 = (bit 15 ) - set means road bridge.
+ * - p2 = (bit 0- 7) - bridge type (hi bh)
+ * - p2 = (bit 8-14) - rail type or road types.
+ * - p2 = (bit 15-16) - transport type.
*/
CommandCost CmdBuildBridge(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p2)
{
@@ -226,7 +226,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p
break;
case TRANSPORT_RAIL:
- railtype = (RailType)GB(p2, 8, 8);
+ railtype = (RailType)GB(p2, 8, 7);
if (!ValParamRailtype(railtype)) return CMD_ERROR;
break;