Author: sveinung
Date: Wed Jun 29 07:44:54 2016
New Revision: 33102
URL: http://svn.gna.org/viewcvs/freeciv?rev=33102&view=rev
Log:
Use action_prob_is_signal(), not a raw check.
Don't assume that an act prob is an int.
See patch #7337
Modified:
trunk/common/actions.c
Modified: trunk/common/actions.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=33102&r1=33101&r2=33102&view=diff
==============================================================================
--- trunk/common/actions.c (original)
+++ trunk/common/actions.c Wed Jun 29 07:44:54 2016
@@ -2610,9 +2610,10 @@
}
}
} else {
- fc_assert_msg(prob_unit <= 200, "Invalid probability %d", prob_unit);
-
- if (200 < prob_all) {
+ fc_assert_msg(!action_prob_is_signal(prob_unit),
+ "Invalid probability %d", prob_unit);
+
+ if (action_prob_is_signal(prob_all)) {
/* Special values dominate regular values. */
continue;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
