Merge remote-tracking branch 'upstream/master' into 13.0

2022-11-26 22:16:25 +04:00
parent 6f44e08cba 4682b3cffb
commit f3ecdf6f7f
508 changed files with 14617 additions and 9750 deletions
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -86,7 +86,7 @@ TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
 		char buf[512];

 		seprintf(buf, lastof(buf), "TILE_ADD(%s) when adding 0x%.4X and 0x%.4X failed",
-			exp, tile, add);
+			exp, (uint32)tile, add);
 #if !defined(_MSC_VER)
 		fprintf(stderr, "%s:%d %s\n", file, line, buf);
 #else