[Freeciv-Dev] Re: [PATCH] check_map_pos change (PR#1031)

[Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx>]

On Tue, Oct 30, 2001 at 02:45:01AM +0000, Gaute B Strokkenes wrote:
> On Mon, 29 Oct 2001, vze2zq63@xxxxxxxxxxx wrote:
> 
> I propose the following:

Ok, but

>  signed short map_get_continent(int x, int y)
>  {
> -  if (!normalize_map_pos(&x, &y))
> +  if (!normalize_map_pos(&x, &y)) /* XXX */

??

>  enum tile_terrain_type map_get_terrain(int x, int y)
>  {
> -  if (!normalize_map_pos(&x, &y))
> +  if (!normalize_map_pos(&x, &y)) /* XXX */

??

>  enum tile_special_type map_get_special(int x, int y)
>  {
> -  if (!normalize_map_pos(&x, &y))
> +  if (!normalize_map_pos(&x, &y)) /* XXX */

??

>  enum known_type tile_is_known(int x, int y)
>  {
> -  if (!normalize_map_pos(&x, &y))
> +  if (!normalize_map_pos(&x, &y)) /* XXX */

??

As stated, we want normal map positions in all cases.

> +#ifndef NDEBUG
> +#define CHECK_POS(x,y) \
> +  (assert(is_normal_map_pos((x),(y))), TRUE)
> +#else
> +#define CHECK_POS(x,y) TRUE
> +#endif

Replace with 
#define CHECK_POS(x,y) (assert(is_normal_map_pos((x),(y))), TRUE)

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "Many of my assistants were fans of Tolkien, who wrote 'Lord of the Rings'
  and a number of other children's stories for adults.  The first character
  alphabet that was programmed for my plotter was Elvish rather than Latin."
    -- from SAIs "life as a computer for a quarter of a century"