Author: cazfi
Date: Wed Dec 16 19:54:12 2015
New Revision: 31019

URL: http://svn.gna.org/viewcvs/freeciv?rev=31019&view=rev
Log:
Make correct number of mapgeneneration retry attempts before giving up.

See bug #23885

Modified:
    trunk/server/srv_main.c

Modified: trunk/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=31019&r1=31018&r2=31019&view=diff
==============================================================================
--- trunk/server/srv_main.c     (original)
+++ trunk/server/srv_main.c     Wed Dec 16 19:54:12 2015
@@ -2993,6 +2993,8 @@
     for (i = 0; !created && i < max ; i++) {
       created = map_fractal_generate(TRUE, utype);
       if (!created && max > 1) {
+        int set;
+
         if (i == 0) {
           /* We will retry only if max attempts allow it */
           log_normal(_("Failed to create suitable map, retrying with another 
mapseed."));
@@ -3013,20 +3015,20 @@
         /* Remove old information already present in tiles */
         map_free();
         /* Restore the settings. */
-        for (i = 0; i < ARRAY_SIZE(mapgen_settings); i++) {
-          struct setting *pset = setting_by_name(mapgen_settings[i].name);
+        for (set = 0; set < ARRAY_SIZE(mapgen_settings); set++) {
+          struct setting *pset = setting_by_name(mapgen_settings[set].name);
 #ifdef FREECIV_NDEBUG
-          setting_enum_set(pset, mapgen_settings[i].value, NULL, NULL, 0);
+          setting_enum_set(pset, mapgen_settings[set].value, NULL, NULL, 0);
 #else  /* FREECIV_NDEBUG */
           char error[128];
           bool success;
 
           fc_assert_action(pset != NULL, continue);
-          success = setting_enum_set(pset, mapgen_settings[i].value,
+          success = setting_enum_set(pset, mapgen_settings[set].value,
                                      NULL, error, sizeof(error));
           fc_assert_msg(success == TRUE,
                         "Failed to restore '%s': %s",
-                        mapgen_settings[i].name,
+                        mapgen_settings[set].name,
                         error);
 #endif /* FREECIV_NDEBUG */
         }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to