From 6b613957d8f2aa64d56e0ed5c4f1099f48f99b5b Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sun, 10 Mar 2024 14:25:22 +0100
Subject: [PATCH] Codechange: simplify the validation logic when adding tiles

---
 src/map.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/map.cpp b/src/map.cpp
index 291f4b5992..69b01ceaa2 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -17,11 +17,6 @@
 
 #include "safeguards.h"
 
-#if defined(_MSC_VER)
-/* Why the hell is that not in all MSVC headers?? */
-extern "C" _CRTIMP void __cdecl _assert(void *, void *, unsigned);
-#endif
-
 /* static */ uint Map::log_x;     ///< 2^_map_log_x == _map_size_x
 /* static */ uint Map::log_y;     ///< 2^_map_log_y == _map_size_y
 /* static */ uint Map::size_x;    ///< Size of the map along the X
@@ -75,19 +70,11 @@ TileIndex TILE_ADD(TileIndex tile, TileIndexDiff offset, std::source_location lo
 	if (dx >= (int)Map::SizeX() / 2) dx -= Map::SizeX();
 	int dy = (offset - dx) / (int)Map::SizeX();
 
-	uint x = TileX(tile) + dx;
-	uint y = TileY(tile) + dy;
-
-	if (x >= Map::SizeX() || y >= Map::SizeY()) {
-		std::string message = fmt::format("TILE_ADD when adding 0x{:04X} and 0x{:04X} failed",
-			tile, offset);
-#if !defined(_MSC_VER)
-		fmt::print(stderr, "{}:{}:{} {}\n", location.file_name(), location.line(), location.column(), message);
-#else
-		_assert(message.data(), (char*)location.file_name(), location.line());
-#endif
-	}
+	uint32_t x = TileX(tile) + dx;
+	uint32_t y = TileY(tile) + dy;
 
+	assert(x < Map::SizeX());
+	assert(y < Map::SizeY());
 	assert(TileXY(x, y) == Map::WrapToMap(tile + offset));
 
 	return TileXY(x, y);