Author: sveinung
Date: Tue Oct  4 13:11:02 2016
New Revision: 33990

URL: http://svn.gna.org/viewcvs/freeciv?rev=33990&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:
    branches/S2_6/common/requirements.c

Modified: branches/S2_6/common/requirements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/requirements.c?rev=33990&r1=33989&r2=33990&view=diff
==============================================================================
--- branches/S2_6/common/requirements.c (original)
+++ branches/S2_6/common/requirements.c Tue Oct  4 13:11:02 2016
@@ -956,9 +956,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

Reply via email to