Author: cazfi Date: Tue Jun 28 06:48:38 2016 New Revision: 33069 URL: http://svn.gna.org/viewcvs/freeciv?rev=33069&view=rev Log: Send unit classs non_native_def_pct to the client, so winning chance display for units on non-native terrain is shown correctly.
Reported by Fomalhaut See bug #24799 Modified: branches/S2_6/client/packhand.c branches/S2_6/common/packets.def branches/S2_6/fc_version branches/S2_6/server/ruleset.c Modified: branches/S2_6/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=33069&r1=33068&r2=33069&view=diff ============================================================================== --- branches/S2_6/client/packhand.c (original) +++ branches/S2_6/client/packhand.c Tue Jun 28 06:48:38 2016 @@ -3159,10 +3159,11 @@ fc_assert_ret_msg(NULL != c, "Bad unit_class %d.", p->id); names_set(&c->name, NULL, p->name, p->rule_name); - c->min_speed = p->min_speed; - c->hp_loss_pct = p->hp_loss_pct; - c->hut_behavior = p->hut_behavior; - c->flags = p->flags; + c->min_speed = p->min_speed; + c->hp_loss_pct = p->hp_loss_pct; + c->hut_behavior = p->hut_behavior; + c->non_native_def_pct = p->non_native_def_pct; + c->flags = p->flags; PACKET_STRVEC_EXTRACT(c->helptext, p->helptext); } Modified: branches/S2_6/common/packets.def URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.def?rev=33069&r1=33068&r2=33069&view=diff ============================================================================== --- branches/S2_6/common/packets.def (original) +++ branches/S2_6/common/packets.def Tue Jun 28 06:48:38 2016 @@ -1592,6 +1592,7 @@ MOVEFRAGS min_speed; UINT8 hp_loss_pct; UINT8 hut_behavior; + UINT16 non_native_def_pct; BV_UCLASS_FLAGS flags; STRVEC helptext[MAX_LEN_PACKET]; Modified: branches/S2_6/fc_version URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=33069&r1=33068&r2=33069&view=diff ============================================================================== --- branches/S2_6/fc_version (original) +++ branches/S2_6/fc_version Tue Jun 28 06:48:38 2016 @@ -55,7 +55,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-2.6-2016.Jun.25" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Jun.28" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" Modified: branches/S2_6/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=33069&r1=33068&r2=33069&view=diff ============================================================================== --- branches/S2_6/server/ruleset.c (original) +++ branches/S2_6/server/ruleset.c Tue Jun 28 06:48:38 2016 @@ -5937,6 +5937,7 @@ packet.min_speed = c->min_speed; packet.hp_loss_pct = c->hp_loss_pct; packet.hut_behavior = c->hut_behavior; + packet.non_native_def_pct = c->non_native_def_pct; packet.flags = c->flags; PACKET_STRVEC_COMPUTE(packet.helptext, c->helptext); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits