Author: sveinung
Date: Thu Mar 16 17:56:26 2017
New Revision: 35119
URL: http://svn.gna.org/viewcvs/freeciv?rev=35119&view=rev
Log:
Clarify "no action" in action details requests.
See hrm Feature #644959
Modified:
trunk/client/packhand.c
trunk/server/unithand.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=35119&r1=35118&r2=35119&view=diff
==============================================================================
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Thu Mar 16 17:56:26 2017
@@ -4400,8 +4400,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)
@@ -4411,7 +4411,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.",
@@ -4460,7 +4460,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: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=35119&r1=35118&r2=35119&view=diff
==============================================================================
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Thu Mar 16 17:56:26 2017
@@ -2020,7 +2020,7 @@
dsend_packet_unit_action_answer(pc,
diplomat_id, target_id,
0,
- ACTION_COUNT);
+ ACTION_NONE);
}
/**************************************************************************
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
