cpp/openttd-patchpack/source File Diff

File diff r3932:71f9d9da69b4 → r3933:400e9c30928e

bridge_map.c

➞

Show inline comments

@@ @@ -3,22 +3,25 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "bridge_map.h"
 #include "variables.h"
 TileIndex GetBridgeEnd(TileIndex tile, DiagDirection dir)
+{
 	TileIndexDiff delta = TileOffsByDir(dir);
 	assert(DiagDirToAxis(dir) == GetBridgeAxis(tile));
 	do {
 		tile += delta;
 	} while (!IsBridgeRamp(tile));
 	do { tile += delta; } while (IsBridgeAbove(tile) && IsBridgeOfAxis(tile, DiagDirToAxis(dir)));
 	return tile;
+}
 TileIndex GetNorthernBridgeEnd(TileIndex t)
+{
 	return GetBridgeEnd(t, ReverseDiagDir(AxisToDiagDir(GetBridgeAxis(t))));
+}
 TileIndex GetSouthernBridgeEnd(TileIndex t)
+{
 	return GetBridgeEnd(t, AxisToDiagDir(GetBridgeAxis(t)));
@@ @@ -27,11 +30,25 @@ TileIndex GetSouthernBridgeEnd(TileIndex @@
 TileIndex GetOtherBridgeEnd(TileIndex tile)
+{
 	TileIndexDiff delta = TileOffsByDir(GetBridgeRampDirection(tile));
 	assert(IsBridgeTile(tile));
 	return GetBridgeEnd(tile, GetBridgeRampDirection(tile));
+}
 uint GetBridgeHeight(TileIndex tile, Axis a)
+{
 	uint h, f;
 	uint tileh = GetTileSlope(tile, &h);
 	f = GetBridgeFoundation(tileh, a);
 	do {
 		tile += delta;
 	} while (!IsBridgeRamp(tile));
 	if (f) {
 		if (f < 15) {
 			h += TILE_HEIGHT;
 			tileh = SLOPE_FLAT;
 		} else {
 			tileh = _inclined_tileh[f - 15];
+		}
+	}
-	return tile;
+	return h + TILE_HEIGHT;
+}