diff -Nurd -X freeciv.current/diff_ignore work.clean/common/map.c work.get_city/common/map.c --- work.clean/common/map.c Sun Aug 26 11:28:16 2001 +++ work.get_city/common/map.c Sun Sep 2 23:24:16 2001 @@ -1231,6 +1231,7 @@ reset_move_costs(x, y); } +#if 0 /*************************************************************** ... ***************************************************************/ @@ -1239,7 +1240,7 @@ x = map_adjust_x(x); y = map_adjust_y(y); return (map.tiles + x + y*map.xsize)->city; } - +#endif /*************************************************************** ... diff -Nurd -X freeciv.current/diff_ignore work.clean/common/map.h work.get_city/common/map.h --- work.clean/common/map.h Sun Aug 26 11:28:17 2001 +++ work.get_city/common/map.h Sun Sep 2 23:23:35 2001 @@ -570,4 +570,6 @@ #define MAP_MIN_GENERATOR 1 #define MAP_MAX_GENERATOR 4 +#include "map_inline.h" + #endif /* FC__MAP_H */ diff -Nurd -X freeciv.current/diff_ignore work.clean/common/map_inline.h work.get_city/common/map_inline.h --- work.clean/common/map_inline.h Thu Jan 1 01:00:00 1970 +++ work.get_city/common/map_inline.h Sun Sep 2 23:24:37 2001 @@ -0,0 +1,9 @@ + +/*************************************************************** +... +***************************************************************/ +extern inline struct city *map_get_city(int x, int y) +{ + x = map_adjust_x(x); y = map_adjust_y(y); + return (map.tiles + x + y*map.xsize)->city; +}