summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-01-07 17:47:29 +0000
committertron <tron@openttd.org>2005-01-07 17:47:29 +0000
commit76c7f3b14e159539e512ac6f13019eea0bad1a04 (patch)
tree81b525629548d21d2ca57ab7acb702b667f72c3f
parent35972e68e144030fa04198ba7f47ccc21ae5dfa4 (diff)
downloadopenttd-76c7f3b14e159539e512ac6f13019eea0bad1a04.tar.xz
(svn r1416) Print sensible information in SafeTileAdd() if gcc is used
-rw-r--r--macros.h2
-rw-r--r--misc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/macros.h b/macros.h
index 227da3871..bd5604419 100644
--- a/macros.h
+++ b/macros.h
@@ -87,7 +87,7 @@ extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int
# define TILE_ADD(x,y) ((x)+(y))
#else
# if defined(__GNUC__)
-# define TILE_ADD(x,y) (SafeTileAdd((x),(y), "??", __FILE__, __LINE__))
+# define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ", " #y, __FILE__, __LINE__))
# else
# define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ## ", " ## #y, __FILE__, __LINE__))
# endif
diff --git a/misc.c b/misc.c
index 7a7b41d51..c37122df7 100644
--- a/misc.c
+++ b/misc.c
@@ -740,7 +740,7 @@ extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, i
sprintf(buf, "TILE_ADD(%s) when adding 0x%.4X and %d failed", exp, tile, add);
#if !defined(_DEBUG) || !defined(_MSC_VER)
- printf("%s\n", buf);
+ fprintf(stderr, "%s:%d %s\n", file, line, buf);
#else
_assert(buf, (char*)file, line);
#endif