Author: sveinung Date: Thu Mar 16 17:59:54 2017 New Revision: 35122 URL: http://svn.gna.org/viewcvs/freeciv?rev=35122&view=rev Log: Clarify "no action" in action details requests.
See hrm Feature #644959 Modified: branches/S3_0/client/packhand.c branches/S3_0/server/unithand.c Modified: branches/S3_0/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/packhand.c?rev=35122&r1=35121&r2=35122&view=diff ============================================================================== --- branches/S3_0/client/packhand.c (original) +++ branches/S3_0/client/packhand.c Thu Mar 16 17:59:54 2017 @@ -4399,8 +4399,8 @@ /************************************************************************** Handle the requested follow up question about an action - The action can be a valid action or the special value ACTION_COUNT. - ACTION_COUNT indicates that performing the action is impossible. + The action can be a valid action or the special value ACTION_NONE. + ACTION_NONE indicates that performing the action is impossible. **************************************************************************/ void handle_unit_action_answer(int diplomat_id, int target_id, int cost, enum gen_action action_type) @@ -4410,7 +4410,7 @@ struct unit *pdiplomat = player_unit_by_number(client_player(), diplomat_id); - if (ACTION_COUNT != action_type + if (ACTION_NONE != action_type && !action_id_exists(action_type)) { /* Non existing action */ log_error("handle_unit_action_answer() the action %d doesn't exist.", @@ -4459,7 +4459,7 @@ action_selection_next_in_focus(diplomat_id); } break; - case ACTION_COUNT: + case ACTION_NONE: log_debug("Server didn't respond to query."); action_selection_no_longer_in_progress(diplomat_id); action_decision_clear_want(diplomat_id); Modified: branches/S3_0/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/unithand.c?rev=35122&r1=35121&r2=35122&view=diff ============================================================================== --- branches/S3_0/server/unithand.c (original) +++ branches/S3_0/server/unithand.c Thu Mar 16 17:59:54 2017 @@ -2020,7 +2020,7 @@ dsend_packet_unit_action_answer(pc, diplomat_id, target_id, 0, - ACTION_COUNT); + ACTION_NONE); } /************************************************************************** _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits