[Freeciv-Dev] (PR#16540) Buggy Barbarians 1 - Taking Barbarians

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

> [nanakaland@xxxxxxxxx - Wed Apr 19 14:43:12 2006]:
> 
> This is barbarian bug 1 of 3 that I spotted with the latest SVN version.
> 
> When mode is set so you can take barbarians (b), the savefile does not
> remember it and you have to manually enter it in every time you load
> the game. This is minor, but probably should be fixed.

This should fix it.  Please test.

Patch is for 2.1 but probably applies to 2.0 and the dev branch as well.

-jason

Index: server/savegame.c
===================================================================
--- server/savegame.c   (revision 11877)
+++ server/savegame.c   (working copy)
@@ -3668,6 +3668,9 @@
     sz_strlcpy(game.demography,
               secfile_lookup_str_default(file, GAME_DEFAULT_DEMOGRAPHY,
                                          "game.demography"));
+    sz_strlcpy(game.allow_take,
+              secfile_lookup_str_default(file, GAME_DEFAULT_ALLOW_TAKE,
+                                         "game.allow_take"));
 
     game.info.spacerace = secfile_lookup_bool_default(file, 
game.info.spacerace,
                                                "game.spacerace");
@@ -4138,6 +4141,7 @@
   secfile_insert_int(file, game.info.occupychance, "game.occupychance");
   secfile_insert_bool(file, game.info.autoattack, "game.autoattack");
   secfile_insert_str(file, game.demography, "game.demography");
+  secfile_insert_str(file, game.allow_take, "game.allow_take");
   secfile_insert_int(file, game.info.borders, "game.borders");
   secfile_insert_bool(file, game.info.happyborders, "game.happyborders");
   secfile_insert_int(file, game.info.diplomacy, "game.diplomacy");