From 79d29b7633da52647b7ad4a36fb016ee0cf13801 Mon Sep 17 00:00:00 2001 From: darkvater Date: Mon, 3 Jan 2005 19:09:45 +0000 Subject: (svn r1346) -Fix: fix signed/unsigned warnings -Fix: latent removal of 2 lines from ttd.c which I forgot because the file was not saved :O --- misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'misc.c') diff --git a/misc.c b/misc.c index 2431b0028..3f6d337a3 100644 --- a/misc.c +++ b/misc.c @@ -737,10 +737,10 @@ int FindFirstBit(uint32 value) extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line) { - int x = GET_TILE_X(tile) + (signed char)(add & 0xFF); - int y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80); + uint x = GET_TILE_X(tile) + (signed char)(add & 0xFF); + uint y = GET_TILE_Y(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80); - if (x < 0 || y < 0 || x >= MapSizeX() || y >= MapSizeY()) { + if (x >= MapSizeX() || y >= MapSizeY()) { char buf[512]; sprintf(buf, "TILE_ADD(%s) when adding 0x%.4X and %d failed", exp, tile, add); -- cgit v1.2.3-54-g00ecf