Author: sveinung Date: Wed Mar 23 12:29:16 2016 New Revision: 32265 URL: http://svn.gna.org/viewcvs/freeciv?rev=32265&view=rev Log: Action probability checks aren't bool.
Make the action and target exists assertions return ACTPROB_IMPOSSIBLE rather than FALSE. See bug #24535 Modified: trunk/common/actions.c Modified: trunk/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=32265&r1=32264&r2=32265&view=diff ============================================================================== --- trunk/common/actions.c (original) +++ trunk/common/actions.c Wed Mar 23 12:29:16 2016 @@ -2329,14 +2329,16 @@ } fc_assert_ret_val_msg(AAK_UNIT == action_get_actor_kind(action_id), - FALSE, "Action %s is performed by %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is performed by %s not %s", gen_action_name(action_id), action_actor_kind_name( action_get_actor_kind(action_id)), action_actor_kind_name(AAK_UNIT)); fc_assert_ret_val_msg(ATK_CITY == action_get_target_kind(action_id), - FALSE, "Action %s is against %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is against %s not %s", gen_action_name(action_id), action_target_kind_name( action_get_target_kind(action_id)), @@ -2375,14 +2377,16 @@ } fc_assert_ret_val_msg(AAK_UNIT == action_get_actor_kind(action_id), - FALSE, "Action %s is performed by %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is performed by %s not %s", gen_action_name(action_id), action_actor_kind_name( action_get_actor_kind(action_id)), action_actor_kind_name(AAK_UNIT)); fc_assert_ret_val_msg(ATK_UNIT == action_get_target_kind(action_id), - FALSE, "Action %s is against %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is against %s not %s", gen_action_name(action_id), action_target_kind_name( action_get_target_kind(action_id)), @@ -2421,14 +2425,16 @@ } fc_assert_ret_val_msg(AAK_UNIT == action_get_actor_kind(action_id), - FALSE, "Action %s is performed by %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is performed by %s not %s", gen_action_name(action_id), action_actor_kind_name( action_get_actor_kind(action_id)), action_actor_kind_name(AAK_UNIT)); fc_assert_ret_val_msg(ATK_UNITS == action_get_target_kind(action_id), - FALSE, "Action %s is against %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is against %s not %s", gen_action_name(action_id), action_target_kind_name( action_get_target_kind(action_id)), @@ -2502,14 +2508,16 @@ } fc_assert_ret_val_msg(AAK_UNIT == action_get_actor_kind(action_id), - FALSE, "Action %s is performed by %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is performed by %s not %s", gen_action_name(action_id), action_actor_kind_name( action_get_actor_kind(action_id)), action_actor_kind_name(AAK_UNIT)); fc_assert_ret_val_msg(ATK_TILE == action_get_target_kind(action_id), - FALSE, "Action %s is against %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is against %s not %s", gen_action_name(action_id), action_target_kind_name( action_get_target_kind(action_id)), @@ -2543,14 +2551,16 @@ } fc_assert_ret_val_msg(AAK_UNIT == action_get_actor_kind(action_id), - FALSE, "Action %s is performed by %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is performed by %s not %s", gen_action_name(action_id), action_actor_kind_name( action_get_actor_kind(action_id)), action_actor_kind_name(AAK_UNIT)); fc_assert_ret_val_msg(ATK_SELF == action_get_target_kind(action_id), - FALSE, "Action %s is against %s not %s", + ACTPROB_IMPOSSIBLE, + "Action %s is against %s not %s", gen_action_name(action_id), action_target_kind_name( action_get_target_kind(action_id)), _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits