[Freeciv-Dev] Re: (PR#9695) mapgen error / topology 11

["Marcelo Burda" <mburda@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9695 >

Le mar 17/08/2004 à 10:31, Mateusz Stefek a écrit :
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9695 >
> 
> > [mburda - Sat Aug 14 09:21:44 2004]:
> > 
> > > [mburda - Sam. Aoû. 14 09:18:48 2004]:
> > > 
> > > Fixed:
> > > Marcelo
> > > 
> > get this file (i delete a unneeded assert)
> > 
> The patch seems logical
> But this looks like something independent:
> @@ -1502,16 +1504,14 @@
>        freelog(LOG_DEBUG, "Adding %d,%d as starting position %d.",
>             x, y, data.count);
>        data.count++;
> +
>      } else {
>        data.dist--;
>        if (data.dist == 0) {
> -     char filename[] = "map_core.sav";
> -
> -     save_game(filename);
>       die(_("The server appears to have gotten into an infinite loop "
>             "in the allocation of starting positions, and will abort.\n"
> -           "The map has been saved into %s.\n"
> -           "Please report this bug at %s."), filename, WEBSITE_URL);
> +           "Maybe the numbers of players/ia is too much for this map.\n"
> +           "Please report this bug at %s."), WEBSITE_URL);
>        }
>      }
>    }
> 
> @@ -1717,6 +1715,9 @@
>      }
>    }
when Adding %d,%d as starting position fail some data are not
initialised, then save_game can purly fail, as savegame is not needed
this is best to go to a clean die.

These 2 bugs are mixed, the first start the second. then i FIX 2