Merge 38462627db into baced00e9f

Codechange: 3 steps of std::min/max with 2 elements are faster than 1 single step with 4
2025-07-13 04:45:23 +00:00 · 2025-01-02 15:55:42 +00:00
1 changed files with 16 additions and 12 deletions
--- a/src/tile_map.cpp
+++ b/src/tile_map.cpp
@ -120,12 +120,14 @@ int GetTileZ(TileIndex tile)
 	uint x2 = std::min(x1 + 1, Map::MaxX());
 	uint y2 = std::min(y1 + 1, Map::MaxY());
-	return std::min({
+	return std::min(
-		TileHeight(tile),           // N corner
+		std::min(
-		TileHeight(TileXY(x2, y1)), // W corner
+			TileHeight(tile),            // N corner
-		TileHeight(TileXY(x1, y2)), // E corner
+			TileHeight(TileXY(x2, y1))), // W corner
-		TileHeight(TileXY(x2, y2)), // S corner
+		std::min(
-	});
+			TileHeight(TileXY(x1, y2)),  // E corner
 			TileHeight(TileXY(x2, y2)))  // S corner
 	);
 }
 /**
@ -140,10 +142,12 @@ int GetTileMaxZ(TileIndex t)
 	uint x2 = std::min(x1 + 1, Map::MaxX());
 	uint y2 = std::min(y1 + 1, Map::MaxY());
-	return std::max({
+	return std::max(
-		TileHeight(t),              // N corner
+		std::max(
-		TileHeight(TileXY(x2, y1)), // W corner
+			TileHeight(t),               // N corner
-		TileHeight(TileXY(x1, y2)), // E corner
+			TileHeight(TileXY(x2, y1))), // W corner
-		TileHeight(TileXY(x2, y2)), // S corner
+		std::max(
-	});
+			TileHeight(TileXY(x1, y2)),  // E corner
 			TileHeight(TileXY(x2, y2)))  // S corner
 	);
 }
Author	SHA1	Message	Date
SamuXarick	a9e499abba	Merge `38462627db` into `baced00e9f`	2025-07-13 04:45:23 +00:00
SamuXarick	38462627db	Codechange: 3 steps of std::min/max with 2 elements are faster than 1 single step with 4	2025-01-02 15:55:42 +00:00