Author: sveinung
Date: Sun Oct 18 19:35:05 2015
New Revision: 30128
URL: http://svn.gna.org/viewcvs/freeciv?rev=30128&view=rev
Log:
It's not just diplomats that wants input
The packet unit_actor_wants_input is sent when an actor unit can trigger an
action selection dialog pop up. It isn't limited to diplomats any more.
Rename it to unit_actor_wants_input.
See patch #6436
Modified:
branches/S2_6/client/packhand.c
branches/S2_6/common/packets.def
branches/S2_6/server/unithand.c
Modified: branches/S2_6/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=30128&r1=30127&r2=30128&view=diff
==============================================================================
--- branches/S2_6/client/packhand.c (original)
+++ branches/S2_6/client/packhand.c Sun Oct 18 19:35:05 2015
@@ -4058,7 +4058,7 @@
/**************************************************************************
Handle request for user input on what diplomat action to do.
**************************************************************************/
-void handle_unit_diplomat_wants_input(int diplomat_id, int target_tile_id)
+void handle_unit_actor_wants_input(int diplomat_id, int target_tile_id)
{
struct unit *pdiplomat = player_unit_by_number(client_player(),
diplomat_id);
Modified: branches/S2_6/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.def?rev=30128&r1=30127&r2=30128&view=diff
==============================================================================
--- branches/S2_6/common/packets.def (original)
+++ branches/S2_6/common/packets.def Sun Oct 18 19:35:05 2015
@@ -1024,7 +1024,7 @@
GEN_ACTION action_type;
end
-PACKET_UNIT_DIPLOMAT_WANTS_INPUT = 86; sc, dsend, lsend
+PACKET_UNIT_ACTOR_WANTS_INPUT = 86; sc, dsend, lsend
UNIT diplomat_id;
TILE target_tile_id;
end
Modified: branches/S2_6/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unithand.c?rev=30128&r1=30127&r2=30128&view=diff
==============================================================================
--- branches/S2_6/server/unithand.c (original)
+++ branches/S2_6/server/unithand.c Sun Oct 18 19:35:05 2015
@@ -2283,9 +2283,9 @@
* end of the function.) */
send_unit_info(player_reply_dest(pplayer), punit);
- dlsend_packet_unit_diplomat_wants_input(player_reply_dest(pplayer),
- punit->id,
- pdesttile->index);
+ dlsend_packet_unit_actor_wants_input(player_reply_dest(pplayer),
+ punit->id,
+ pdesttile->index);
return FALSE;
} else if (!may_non_act_move(punit, pcity, pdesttile, igzoc)) {
/* No action can be done. No regular move can be done. Attack isn't
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
