Author: cazfi
Date: Mon Jan 25 15:14:38 2016
New Revision: 31587
URL: http://svn.gna.org/viewcvs/freeciv?rev=31587&view=rev
Log:
De not fill terrident mappings from the current version of the ruleset.
See bug #24325
Modified:
trunk/server/savegame2.c
trunk/server/savegame3.c
Modified: trunk/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=31587&r1=31586&r2=31587&view=diff
==============================================================================
--- trunk/server/savegame2.c (original)
+++ trunk/server/savegame2.c Mon Jan 25 15:14:38 2016
@@ -1396,15 +1396,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));
Modified: trunk/server/savegame3.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=31587&r1=31586&r2=31587&view=diff
==============================================================================
--- trunk/server/savegame3.c (original)
+++ trunk/server/savegame3.c Mon Jan 25 15:14:38 2016
@@ -1469,15 +1469,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
