From 7381e00859e579d0c0a47c6a92b8aadf91715177 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 1 Nov 2020 21:35:21 +0000 Subject: [PATCH] DEBUG: Add bridge pillar index to debug landinfo print --- src/bridge.h | 1 + src/misc_gui.cpp | 2 +- src/tunnelbridge_cmd.cpp | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bridge.h b/src/bridge.h index 228972f00c..23b6bbf158 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -103,6 +103,7 @@ BridgePiecePillarFlags GetBridgeTilePillarFlags(TileIndex tile, TileIndex northe struct BridgePieceDebugInfo { BridgePieces piece; BridgePiecePillarFlags pillar_flags; + uint pillar_index; }; BridgePieceDebugInfo GetBridgePieceDebugInfo(TileIndex tile); diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index a3411f35a2..e5a1b38c59 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -139,7 +139,7 @@ public: } if (IsBridgeAbove(tile)) { BridgePieceDebugInfo info = GetBridgePieceDebugInfo(tile); - DEBUG(misc, LANDINFOD_LEVEL, "bridge above: piece: %u, pillars: %X", info.piece, info.pillar_flags); + DEBUG(misc, LANDINFOD_LEVEL, "bridge above: piece: %u, pillars: %X, pillar index: %u", info.piece, info.pillar_flags, info.pillar_index); } DEBUG(misc, LANDINFOD_LEVEL, "type = %#x", _m[tile].type); DEBUG(misc, LANDINFOD_LEVEL, "height = %#x", _m[tile].height); diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 4e350692e5..51b78548ef 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -2078,7 +2078,9 @@ BridgePieceDebugInfo GetBridgePieceDebugInfo(TileIndex tile) GetTunnelBridgeLength(tile, rampsouth) + 1 ); BridgePiecePillarFlags pillar_flags = GetBridgeTilePillarFlags(tile, rampnorth, rampsouth, GetBridgeType(rampnorth), GetTunnelBridgeTransportType(rampnorth)); - return { piece, pillar_flags }; + const Axis axis = TileX(rampnorth) == TileX(rampsouth) ? AXIS_Y : AXIS_X; + uint pillar_index = piece * 2 + (axis == AXIS_Y ? 1 : 0); + return { piece, pillar_flags, pillar_index }; } /**