openttd updated to 1.5.0-beta2

--HG--
branch : openttd

src/map.cpp

@@ -1,4 +1,4 @@
-/* $Id: map.cpp 23740 2012-01-03 21:32:51Z rubidium $ */
+/* $Id: map.cpp 26503 2014-04-24 18:49:24Z rubidium $ */
 
 /*
  * This file is part of OpenTTD.
@@ -13,6 +13,9 @@
 #include "debug.h"
 #include "core/alloc_func.hpp"
 #include "water_map.h"
+#include "string_func.h"
+
+#include "safeguards.h"
 
 #if defined(_MSC_VER)
 /* Why the hell is that not in all MSVC headers?? */
@@ -82,7 +85,7 @@ TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
 	if (x >= MapSizeX() || y >= MapSizeY()) {
 		char buf[512];
 
-		snprintf(buf, lengthof(buf), "TILE_ADD(%s) when adding 0x%.4X and 0x%.4X failed",
+		seprintf(buf, lastof(buf), "TILE_ADD(%s) when adding 0x%.4X and 0x%.4X failed",
 			exp, tile, add);
 #if !defined(_MSC_VER) || defined(WINCE)
 		fprintf(stderr, "%s:%d %s\n", file, line, buf);