petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1447) Move TILE_ADD(), TILE_ADDXY() and SafeTileAdd() to map.[ch] and make the latter map size agnostic

Browse Source
This commit is contained in:
tron
2005-01-09 17:55:11 +00:00
parent 32f480a4ae
commit 55e6b4f928
4 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
misc.c
View File

@@ -730,27 +730,6 @@ int FindFirstBit(uint32 value)
}
uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
{
uint x = TileX(tile) + (signed char)(add & 0xFF);
uint y = TileY(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);
if (x >= MapSizeX() || y >= MapSizeY()) {
char buf[512];
sprintf(buf, "TILE_ADD(%s) when adding 0x%.4X and %d failed", exp, tile, add);
#if !defined(_DEBUG) || !defined(_MSC_VER)
fprintf(stderr, "%s:%d %s\n", file, line, buf);
#else
_assert(buf, (char*)file, line);
#endif
}
assert(TILE_XY(x,y) == TILE_MASK(tile + add));
return TILE_XY(x,y);
}
static void Save_NAME()
{
int i;