[Freeciv-Dev] (PR#13315) Crash in map generator generator=3 startpos=3 landmass=85

["Mateusz Stefek" <mstefek@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13315 >

http://pubserver.freeciv.org/games/440269/
http://pubserver.freeciv.org/games/440268/
http://pubserver.freeciv.org/games/440267/

When generator4() fails it sets wrong fallback parameters and the map
isn't initialized at all.

Patch attached.

BTW generator4() should be renamed.
--
mateusz

Index: server/generator/mapgen.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/mapgen.c,v
retrieving revision 1.12.2.5
diff -u -r1.12.2.5 mapgen.c
--- server/generator/mapgen.c   1 May 2005 05:09:08 -0000       1.12.2.5
+++ server/generator/mapgen.c   23 Jun 2005 10:08:08 -0000
@@ -1914,7 +1914,7 @@
   /* no islands with mass >> sqr(min(xsize,ysize)) */
 
   if (game.nplayers < 2 || map.landpercent > 80) {
-    map.generator = 3;
+    map.startpos = 1;
     return;
   }