Author: sveinung Date: Fri Dec 12 14:01:10 2014 New Revision: 27265 URL: http://svn.gna.org/viewcvs/freeciv?rev=27265&view=rev Log: SDL clients: Check for specific action in sanity test.
Check that the actor unit type is capable of the respective action when sanity checking the reply to the follow up question of the unit bribing and city inciting actions. See patch #5530 Modified: trunk/client/gui-sdl/action_dialog.c trunk/client/gui-sdl2/action_dialog.c Modified: trunk/client/gui-sdl/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/action_dialog.c?rev=27265&r1=27264&r2=27265&view=diff ============================================================================== --- trunk/client/gui-sdl/action_dialog.c (original) +++ trunk/client/gui-sdl/action_dialog.c Fri Dec 12 14:01:10 2014 @@ -1409,7 +1409,7 @@ return; } - if (!actor || !is_actor_unit(actor)) { + if (!actor || !unit_can_do_action(actor, ACTION_SPY_INCITE_CITY)) { choose_action_queue_next(); return; } @@ -1668,7 +1668,7 @@ return; } - if (!actor || !is_actor_unit(actor)) { + if (!actor || !unit_can_do_action(actor, ACTION_SPY_BRIBE_UNIT)) { choose_action_queue_next(); return; } Modified: trunk/client/gui-sdl2/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=27265&r1=27264&r2=27265&view=diff ============================================================================== --- trunk/client/gui-sdl2/action_dialog.c (original) +++ trunk/client/gui-sdl2/action_dialog.c Fri Dec 12 14:01:10 2014 @@ -1408,7 +1408,7 @@ return; } - if (!actor || !is_actor_unit(actor)) { + if (!actor || !unit_can_do_action(actor, ACTION_SPY_INCITE_CITY)) { choose_action_queue_next(); return; } @@ -1666,7 +1666,7 @@ return; } - if (!actor || !is_actor_unit(actor)) { + if (!actor || !unit_can_do_action(actor, ACTION_SPY_BRIBE_UNIT)) { choose_action_queue_next(); return; } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits