Author: sveinung
Date: Tue Aug 16 01:10:03 2016
New Revision: 33602
URL: http://svn.gna.org/viewcvs/freeciv?rev=33602&view=rev
Log:
rscompat: upgrade existing before adding new.
Move the upgrade of existing effects to the start of rscompat_postprocess().
This prevents the new effects it adds from being upgraded by accident.
See patch #7596
Modified:
trunk/server/rscompat.c
Modified: trunk/server/rscompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=33602&r1=33601&r2=33602&view=diff
==============================================================================
--- trunk/server/rscompat.c (original)
+++ trunk/server/rscompat.c Tue Aug 16 01:10:03 2016
@@ -344,6 +344,10 @@
return;
}
+ /* Upgrade existing effects. Done before new effects are added to prevent
+ * the new effects from being upgraded by accident. */
+ iterate_effect_cache(effect_list_compat_cb, info);
+
if (info->ver_cities < 10) {
struct action_auto_perf *auto_perf;
@@ -923,9 +927,6 @@
} extra_type_by_cause_iterate_end;
}
- /* Upgrade existing effects. */
- iterate_effect_cache(effect_list_compat_cb, info);
-
/* The ruleset may need adjustments it didn't need before compatibility
* post processing.
*
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
