Author: sveinung Date: Tue Mar 8 15:28:15 2016 New Revision: 32208 URL: http://svn.gna.org/viewcvs/freeciv?rev=32208&view=rev Log: Drop special text for exact req contradictions.
A requirement vector self contradiction is a self contradiction no matter if it is an exact opposite (present and !present) or not. Simplify so the user only sees one message. See patch #7044 Modified: branches/S2_6/server/rssanity.c Modified: branches/S2_6/server/rssanity.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/rssanity.c?rev=32208&r1=32207&r2=32208&view=diff ============================================================================== --- branches/S2_6/server/rssanity.c (original) +++ branches/S2_6/server/rssanity.c Tue Mar 8 15:28:15 2016 @@ -295,16 +295,6 @@ return FALSE; } requirement_vector_iterate(preqs, nreq) { - if (are_requirements_opposites(preq, nreq)) { - log_error("%s: %s ranged %s %s requirement \"%s\" " - "required to be both present and absent.", - list_for, - req_range_name(preq->range), - preq->survives ? "surviving" : "non surviving", - universal_type_rule_name(&preq->source), - universal_rule_name(&preq->source)); - return FALSE; - } if (are_requirements_contradictions(preq, nreq)) { log_error("%s: Requirements {%s} and {%s} contradict each other.", list_for, _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits