Author: jtn
Date: Tue Sep 27 23:16:22 2016
New Revision: 33916
URL: http://svn.gna.org/viewcvs/freeciv?rev=33916&view=rev
Log:
Enforce that road integrators must be symmetric.
A warning was given, but this didn't stop ruleset loading. But the work
hasn't been done in the game engine to support non-symmetric 'integrates'
relationships properly.
See bug #25116.
Modified:
trunk/server/rssanity.c
Modified: trunk/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=33916&r1=33915&r2=33916&view=diff
==============================================================================
--- trunk/server/rssanity.c (original)
+++ trunk/server/rssanity.c Tue Sep 27 23:16:22 2016
@@ -855,10 +855,12 @@
if (road_index(proad) != road_index(iroad)
&& !BV_ISSET(iroad->integrates, road_index(proad))) {
- ruleset_error(LOG_ERROR,
- "Road %s integrates with non integrating road %s!",
- extra_name_translation(pextra),
- extra_name_translation(iextra));
+ /* We don't support non-symmetric integrator relationships yet. */
+ ruleset_error(LOG_ERROR,
+ "Road '%s' integrates with '%s' but not vice versa!",
+ extra_rule_name(pextra),
+ extra_rule_name(iextra));
+ ok = FALSE;
}
} extra_type_list_iterate_end;
} extra_type_by_cause_iterate_end;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
