Author: sveinung
Date: Tue Oct 4 13:09:18 2016
New Revision: 33988
URL: http://svn.gna.org/viewcvs/freeciv?rev=33988&view=rev
Log:
MinMoveFrags contradiction checking: x != !x.
Fix off by one error that made a present requirement and its not present
counter part appear non contradicting.
See bug #25138
Modified:
trunk/common/requirements.c
Modified: trunk/common/requirements.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=33988&r1=33987&r2=33988&view=diff
==============================================================================
--- trunk/common/requirements.c (original)
+++ trunk/common/requirements.c Tue Oct 4 13:09:18 2016
@@ -1077,9 +1077,9 @@
* be present when the number required to be present is smaller than
* the number required to not be present. */
if (req1->present) {
- return req1->source.value.minmoves > req2->source.value.minmoves;
+ return req1->source.value.minmoves >= req2->source.value.minmoves;
} else {
- return req1->source.value.minmoves < req2->source.value.minmoves;
+ return req1->source.value.minmoves <= req2->source.value.minmoves;
}
}
break;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
