[Freeciv-commits] r33794 - /branches/S2_6/tools/ruledit/rulesave.c

[cazfi74]

Author: cazfi
Date: Tue Sep 13 18:58:36 2016
New Revision: 33794

URL: http://svn.gna.org/viewcvs/freeciv?rev=33794=rev
Log:
Do not save duplicate allowed_... lists to rulesets when nationlist used.

See bug #25052

Modified:
branches/S2_6/tools/ruledit/rulesave.c

Modified: branches/S2_6/tools/ruledit/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/rulesave.c?rev=33794=33793=33794=diff
==
--- branches/S2_6/tools/ruledit/rulesave.c  (original)
+++ branches/S2_6/tools/ruledit/rulesave.c  Tue Sep 13 18:58:36 2016
@@ -1438,20 +1438,22 @@
   save_traits(game.server.default_traits, NULL, sfile,
   "default_traits", "");
 
-  if (game.server.ruledit.allowed_govs != NULL) {
-secfile_insert_str_vec(sfile, game.server.ruledit.allowed_govs,
-   game.server.ruledit.ag_count,
-   "compatibility.allowed_govs");
-  }
-  if (game.server.ruledit.allowed_terrains != NULL) {
-secfile_insert_str_vec(sfile, game.server.ruledit.allowed_terrains,
-   game.server.ruledit.at_count,
-   "compatibility.allowed_terrains");
-  }
-  if (game.server.ruledit.allowed_styles != NULL) {
-secfile_insert_str_vec(sfile, game.server.ruledit.allowed_styles,
-   game.server.ruledit.as_count,
-   "compatibility.allowed_styles");
+  if (data->nationlist == NULL) {
+if (game.server.ruledit.allowed_govs != NULL) {
+  secfile_insert_str_vec(sfile, game.server.ruledit.allowed_govs,
+ game.server.ruledit.ag_count,
+ "compatibility.allowed_govs");
+}
+if (game.server.ruledit.allowed_terrains != NULL) {
+  secfile_insert_str_vec(sfile, game.server.ruledit.allowed_terrains,
+ game.server.ruledit.at_count,
+ "compatibility.allowed_terrains");
+}
+if (game.server.ruledit.allowed_styles != NULL) {
+  secfile_insert_str_vec(sfile, game.server.ruledit.allowed_styles,
+ game.server.ruledit.as_count,
+ "compatibility.allowed_styles");
+}
   }
 
   if (game.default_government != NULL) {


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

[Freeciv-commits] r33793 - /trunk/tools/ruleutil/rulesave.c

[cazfi74]

Author: cazfi
Date: Tue Sep 13 18:58:30 2016
New Revision: 33793

URL: http://svn.gna.org/viewcvs/freeciv?rev=33793=rev
Log:
Do not save duplicate allowed_... lists to rulesets when nationlist used.

See bug #25052

Modified:
trunk/tools/ruleutil/rulesave.c

Modified: trunk/tools/ruleutil/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleutil/rulesave.c?rev=33793=33792=33793=diff
==
--- trunk/tools/ruleutil/rulesave.c (original)
+++ trunk/tools/ruleutil/rulesave.c Tue Sep 13 18:58:30 2016
@@ -1638,20 +1638,22 @@
   save_traits(game.server.default_traits, NULL, sfile,
   "default_traits", "");
 
-  if (game.server.ruledit.allowed_govs != NULL) {
-secfile_insert_str_vec(sfile, game.server.ruledit.allowed_govs,
-   game.server.ruledit.ag_count,
-   "compatibility.allowed_govs");
-  }
-  if (game.server.ruledit.allowed_terrains != NULL) {
-secfile_insert_str_vec(sfile, game.server.ruledit.allowed_terrains,
-   game.server.ruledit.at_count,
-   "compatibility.allowed_terrains");
-  }
-  if (game.server.ruledit.allowed_styles != NULL) {
-secfile_insert_str_vec(sfile, game.server.ruledit.allowed_styles,
-   game.server.ruledit.as_count,
-   "compatibility.allowed_styles");
+  if (data->nationlist == NULL) {
+if (game.server.ruledit.allowed_govs != NULL) {
+  secfile_insert_str_vec(sfile, game.server.ruledit.allowed_govs,
+ game.server.ruledit.ag_count,
+ "compatibility.allowed_govs");
+}
+if (game.server.ruledit.allowed_terrains != NULL) {
+  secfile_insert_str_vec(sfile, game.server.ruledit.allowed_terrains,
+ game.server.ruledit.at_count,
+ "compatibility.allowed_terrains");
+}
+if (game.server.ruledit.allowed_styles != NULL) {
+  secfile_insert_str_vec(sfile, game.server.ruledit.allowed_styles,
+ game.server.ruledit.as_count,
+ "compatibility.allowed_styles");
+}
   }
 
   if (game.default_government != NULL) {


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

[Freeciv-commits] r33791 - /trunk/translations/core/fi.po

[cazfi74]

Author: cazfi
Date: Tue Sep 13 11:26:54 2016
New Revision: 33791

URL: http://svn.gna.org/viewcvs/freeciv?rev=33791=rev
Log:
Updated Finnish translation.

Modified:
trunk/translations/core/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/translations/core/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/fi.po?rev=33791=33790=33791=diff


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

[Freeciv-commits] r33790 - /branches/S2_6/translations/freeciv/fi.po

[cazfi74]

Author: cazfi
Date: Tue Sep 13 11:17:49 2016
New Revision: 33790

URL: http://svn.gna.org/viewcvs/freeciv?rev=33790=rev
Log:
Updated Finnish translation.

Modified:
branches/S2_6/translations/freeciv/fi.po

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/translations/freeciv/fi.po
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/fi.po?rev=33790=33789=33790=diff


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