dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEBUG: Add bridge pillar index to debug landinfo print

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-11-01 21:35:21 +00:00
parent b86f19c121
commit 7381e00859
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/bridge.h
View File

@@ -103,6 +103,7 @@ BridgePiecePillarFlags GetBridgeTilePillarFlags(TileIndex tile, TileIndex northe
struct BridgePieceDebugInfo { struct BridgePieceDebugInfo {
BridgePieces piece; BridgePieces piece;
BridgePiecePillarFlags pillar_flags; BridgePiecePillarFlags pillar_flags;
uint pillar_index;
}; };
BridgePieceDebugInfo GetBridgePieceDebugInfo(TileIndex tile); BridgePieceDebugInfo GetBridgePieceDebugInfo(TileIndex tile);

2
src/misc_gui.cpp
View File

@@ -139,7 +139,7 @@ public:
} }
if (IsBridgeAbove(tile)) { if (IsBridgeAbove(tile)) {
BridgePieceDebugInfo info = GetBridgePieceDebugInfo(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, "type = %#x", _m[tile].type);
DEBUG(misc, LANDINFOD_LEVEL, "height = %#x", _m[tile].height); DEBUG(misc, LANDINFOD_LEVEL, "height = %#x", _m[tile].height);

4
src/tunnelbridge_cmd.cpp
View File

@@ -2078,7 +2078,9 @@ BridgePieceDebugInfo GetBridgePieceDebugInfo(TileIndex tile)
GetTunnelBridgeLength(tile, rampsouth) + 1 GetTunnelBridgeLength(tile, rampsouth) + 1
); );
BridgePiecePillarFlags pillar_flags = GetBridgeTilePillarFlags(tile, rampnorth, rampsouth, GetBridgeType(rampnorth), GetTunnelBridgeTransportType(rampnorth)); 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 };
} }
/** /**