Author: cazfi
Date: Mon Jan 25 15:14:50 2016
New Revision: 31588

URL: http://svn.gna.org/viewcvs/freeciv?rev=31588&view=rev
Log:
De not fill terrident mappings from the current version of the ruleset.

See bug #24325

Modified:
    branches/S2_6/server/savegame2.c

Modified: branches/S2_6/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=31588&r1=31587&r2=31588&view=diff
==============================================================================
--- branches/S2_6/server/savegame2.c    (original)
+++ branches/S2_6/server/savegame2.c    Mon Jan 25 15:14:50 2016
@@ -1869,15 +1869,8 @@
   }
 
   terrain_type_iterate(pterr) {
-    if (pterr->identifier_load == '\0') {
-      /* Use the current identifier for unknown ones. */
-      pterr->identifier_load = pterr->identifier;
-    }
-  } terrain_type_iterate_end;
-
-  terrain_type_iterate(pterr) {
     terrain_type_iterate(pterr2) {
-      if (pterr != pterr2) {
+      if (pterr != pterr2  && pterr->identifier_load != '\0') {
         sg_failure_ret((pterr->identifier_load != pterr2->identifier_load),
                        "%s and %s share a saved identifier",
                        terrain_rule_name(pterr), terrain_rule_name(pterr2));


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

Reply via email to