Author: cazfi
Date: Fri Aug 26 08:50:15 2016
New Revision: 33713

URL: http://svn.gna.org/viewcvs/freeciv?rev=33713&view=rev
Log:
Do not save items marked removed to the ruleset.

See bug #25008

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=33713&r1=33712&r2=33713&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/rulesave.c      (original)
+++ branches/S2_6/tools/ruledit/rulesave.c      Fri Aug 26 08:50:15 2016
@@ -375,7 +375,7 @@
   }
 
   sect_idx = 0;
-  improvement_iterate(pb) {
+  improvement_active_iterate(pb) {
     if (!pb->disabled) {
       char path[512];
       const char *flag_names[IF_COUNT];
@@ -423,7 +423,7 @@
 
       save_strvec(sfile, pb->helptext, path, "helptext");
     }
-  } improvement_iterate_end;
+  } improvement_active_iterate_end;
 
   return save_ruleset_file(sfile, filename);
 }
@@ -1546,7 +1546,7 @@
   }
 
   sect_idx = 0;
-  advance_iterate(A_FIRST, pa) {
+  advance_active_iterate(pa) {
     if (pa->require[AR_ONE] != A_NEVER) {
       char path[512];
       const char *flag_names[TF_COUNT];
@@ -1589,7 +1589,7 @@
       save_strvec(sfile, pa->helptext, path, "helptext");
     }
 
-  } advance_iterate_end;
+  } advance_active_iterate_end;
 
   return save_ruleset_file(sfile, filename);
 }
@@ -2226,7 +2226,7 @@
   } unit_class_iterate_end;
 
   sect_idx = 0;
-  unit_type_iterate(put) {
+  unit_active_type_iterate(put) {
     if (!put->disabled) {
       char path[512];
       const char *flag_names[UTYF_LAST_USER_FLAG + 1];
@@ -2356,7 +2356,7 @@
 
       save_strvec(sfile, put->helptext, path, "helptext");
     }
-  } unit_type_iterate_end;
+  } unit_active_type_iterate_end;
 
   return save_ruleset_file(sfile, filename);
 }


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

Reply via email to