Author: jtn
Date: Mon Jan 25 19:34:31 2016
New Revision: 31598

URL: http://svn.gna.org/viewcvs/freeciv?rev=31598&view=rev
Log:
Correctly load fixed seeds from pre-2.3 scenarios.

See gna bug #24340.

Modified:
    branches/S2_6/server/savegame.c

Modified: branches/S2_6/server/savegame.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame.c?rev=31598&r1=31597&r2=31598&view=diff
==============================================================================
--- branches/S2_6/server/savegame.c     (original)
+++ branches/S2_6/server/savegame.c     Mon Jan 25 19:34:31 2016
@@ -3586,8 +3586,8 @@
     game.server.autoattack =
       secfile_lookup_bool_default(file, GAME_DEFAULT_AUTOATTACK,
                                   "game.autoattack");
-    game.server.seed =
-      secfile_lookup_int_default(file, game.server.seed,
+    game.server.seed = game.server.seed_setting =
+      secfile_lookup_int_default(file, game.server.seed_setting,
                                  "game.randseed");
     game.server.allowed_city_names =
       secfile_lookup_int_default(file, game.server.allowed_city_names,
@@ -3731,9 +3731,10 @@
                                             "map.generator"),
                          "%s", secfile_error());
       game.map.server.generator = ei;
-      fc_assert_exit_msg(secfile_lookup_int(file, &game.map.server.seed,
+      fc_assert_exit_msg(secfile_lookup_int(file, 
&game.map.server.seed_setting,
                                             "map.seed"),
                          "%s", secfile_error());
+      game.map.server.seed = game.map.server.seed_setting;
       fc_assert_exit_msg(secfile_lookup_int(file, &game.map.server.landpercent,
                                             "map.landpercent"),
                          "%s", secfile_error());


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

Reply via email to