Author: sveinung
Date: Thu Jun 30 08:19:03 2016
New Revision: 33114
URL: http://svn.gna.org/viewcvs/freeciv?rev=33114&view=rev
Log:
protocol: send action range in ruleset packet.
Transfer the minimum and the maximum distance between actor and target in
PACKET_RULESET_ACTION. This makes the range available to clients that don't
use Freeciv's C code.
See patch #7348
Modified:
trunk/client/packhand.c
trunk/common/networking/packets.def
trunk/fc_version
trunk/server/ruleset.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=33114&r1=33113&r2=33114&view=diff
==============================================================================
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Thu Jun 30 08:19:03 2016
@@ -3933,6 +3933,9 @@
sz_strlcpy(act->ui_name, p->ui_name);
act->quiet = p->quiet;
+
+ act->min_distance = p->min_distance;
+ act->max_distance = p->max_distance;
act->blocked_by = p->blocked_by;
}
Modified: trunk/common/networking/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/packets.def?rev=33114&r1=33113&r2=33114&view=diff
==============================================================================
--- trunk/common/networking/packets.def (original)
+++ trunk/common/networking/packets.def Thu Jun 30 08:19:03 2016
@@ -1716,6 +1716,9 @@
STRING ui_name[MAX_LEN_NAME];
BOOL quiet;
+
+ SINT32 min_distance;
+ SINT32 max_distance;
BV_ACTIONS blocked_by;
end
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=33114&r1=33113&r2=33114&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Thu Jun 30 08:19:03 2016
@@ -56,7 +56,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Jun.29"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Jun.30"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=33114&r1=33113&r2=33114&view=diff
==============================================================================
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Thu Jun 30 08:19:03 2016
@@ -7135,6 +7135,9 @@
packet.id = act;
sz_strlcpy(packet.ui_name, action_by_number(act)->ui_name);
packet.quiet = action_by_number(act)->quiet;
+
+ packet.min_distance = action_by_number(act)->min_distance;
+ packet.max_distance = action_by_number(act)->max_distance;
packet.blocked_by = action_by_number(act)->blocked_by;
lsend_packet_ruleset_action(dest, &packet);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
