Author: cazfi
Date: Tue Sep 13 18:58:30 2016
New Revision: 33793
URL: http://svn.gna.org/viewcvs/freeciv?rev=33793&view=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&r1=33792&r2=33793&view=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
