Author: cazfi
Date: Tue Jun 28 06:48:45 2016
New Revision: 33070
URL: http://svn.gna.org/viewcvs/freeciv?rev=33070&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_5/client/packhand.c
branches/S2_5/common/packets.def
branches/S2_5/fc_version
branches/S2_5/server/ruleset.c
Modified: branches/S2_5/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/packhand.c?rev=33070&r1=33069&r2=33070&view=diff
==============================================================================
--- branches/S2_5/client/packhand.c (original)
+++ branches/S2_5/client/packhand.c Tue Jun 28 06:48:45 2016
@@ -3014,9 +3014,14 @@
} else {
c->min_speed = p->min_speed_old;
}
- c->hp_loss_pct = p->hp_loss_pct;
- c->hut_behavior = p->hut_behavior;
- c->flags = p->flags;
+ c->hp_loss_pct = p->hp_loss_pct;
+ c->hut_behavior = p->hut_behavior;
+ if (has_capability("nonnatdef", client.conn.capability)) {
+ c->non_native_def_pct = p->non_native_def_pct;
+ } else {
+ c->non_native_def_pct = 100; /* Sensible default */
+ }
+ c->flags = p->flags;
}
/****************************************************************************
Modified: branches/S2_5/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/packets.def?rev=33070&r1=33069&r2=33070&view=diff
==============================================================================
--- branches/S2_5/common/packets.def (original)
+++ branches/S2_5/common/packets.def Tue Jun 28 06:48:45 2016
@@ -1508,6 +1508,7 @@
UINT16 min_speed_new; add-cap(extended_move_rate)
UINT8 hp_loss_pct;
UINT8 hut_behavior;
+ UINT16 non_native_def_pct; add-cap(nonnatdef)
BV_UCLASS_FLAGS flags;
end
Modified: branches/S2_5/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=33070&r1=33069&r2=33070&view=diff
==============================================================================
--- branches/S2_5/fc_version (original)
+++ branches/S2_5/fc_version Tue Jun 28 06:48:45 2016
@@ -55,7 +55,7 @@
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
NETWORK_CAPSTRING_MANDATORY="+Freeciv-2.5-network"
-NETWORK_CAPSTRING_OPTIONAL="nationset_change tech_cost split_reports
extended_move_rate illness_ranges"
+NETWORK_CAPSTRING_OPTIONAL="nationset_change tech_cost split_reports
extended_move_rate illness_ranges nonnatdef"
FREECIV_DISTRIBUTOR=""
Modified: branches/S2_5/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/ruleset.c?rev=33070&r1=33069&r2=33070&view=diff
==============================================================================
--- branches/S2_5/server/ruleset.c (original)
+++ branches/S2_5/server/ruleset.c Tue Jun 28 06:48:45 2016
@@ -5225,6 +5225,7 @@
packet.min_speed_old = packet.min_speed_new = 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;
lsend_packet_ruleset_unit_class(dest, &packet);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
