Author: cazfi
Date: Sat Nov 7 18:01:54 2015
New Revision: 30469
URL: http://svn.gna.org/viewcvs/freeciv?rev=30469&view=rev
Log:
Save trait default values from rulesave.c
See bug #24029
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=30469&r1=30468&r2=30469&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/rulesave.c (original)
+++ branches/S2_6/tools/ruledit/rulesave.c Sat Nov 7 18:01:54 2015
@@ -1148,6 +1148,10 @@
for (tr = trait_begin(); tr != trait_end() && trait_names[tr] != NULL;
tr = trait_next(tr)) {
+ int default_default;
+
+ default_default = (traits[tr].min + traits[tr].max) / 2;
+
if ((default_traits == NULL && traits[tr].min != TRAIT_DEFAULT_VALUE)
|| (default_traits != NULL && traits[tr].min !=
default_traits[tr].min)) {
secfile_insert_int(sfile, traits[tr].min, "%s.%s%s_min", secname,
field_prefix,
@@ -1156,6 +1160,10 @@
if ((default_traits == NULL && traits[tr].max != TRAIT_DEFAULT_VALUE)
|| (default_traits != NULL && traits[tr].max !=
default_traits[tr].max)) {
secfile_insert_int(sfile, traits[tr].max, "%s.%s%s_max", secname,
field_prefix,
+ trait_names[tr]);
+ }
+ if (default_default != traits[tr].fixed) {
+ secfile_insert_int(sfile, traits[tr].fixed, "%s.%s%s_default", secname,
field_prefix,
trait_names[tr]);
}
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
