Project

General

Profile

Download (2.88 KB)

Bug #1654 » 0009-Protocol-Make-tech_upkeep-a-32-bit-value.patch

S3_1 - Marko Lindqvist, 08/17/2025 03:10 PM

View differences:

client/packhand.c
pplayer->economic.tax = pinfo->tax;
pplayer->economic.science = pinfo->science;
pplayer->economic.luxury = pinfo->luxury;
pplayer->client.tech_upkeep = pinfo->tech_upkeep;
if (has_capability("tu32", client.conn.capability)) {
pplayer->client.tech_upkeep = pinfo->tech_upkeep_32;
} else {
pplayer->client.tech_upkeep = pinfo->tech_upkeep_16;
}
pplayer->government = pgov;
pplayer->target_government = ptarget_gov;
/* Don't use player_iterate here, because we ignore the real number
common/networking/packets.def
PERCENT tax, science,luxury;
UINT32 infrapoints;
UINT16 tech_upkeep;
UINT16 tech_upkeep_16; remove-cap(tu32)
UINT32 tech_upkeep_32; add-cap(tu32)
UINT16 science_cost;
BOOL is_connected;
fc_version
# - No new mandatory capabilities can be added to the release branch; doing
# so would break network capability of supposedly "compatible" releases.
#
NETWORK_CAPSTRING="+Freeciv-3.1-network city-original rsdesc32 obsinv ids32 ownernull16"
NETWORK_CAPSTRING="+Freeciv-3.1-network city-original rsdesc32 obsinv ids32 ownernull16 tu32"
FREECIV_DISTRIBUTOR=""
if test "x$FREECIV_LABEL_FORCE" != "x" ; then
server/plrhand.c
if (info_level >= INFO_EMBASSY
|| (receiver
&& player_diplstate_get(plr, receiver)->type == DS_TEAM)) {
packet->tech_upkeep = player_tech_upkeep(plr);
packet->tech_upkeep_32 = player_tech_upkeep(plr);
} else {
packet->tech_upkeep = 0;
packet->tech_upkeep_32 = 0;
}
packet->tech_upkeep_16 = packet->tech_upkeep_32;
/* Send most civ info about the player only to players who have an
* embassy. */
(8-8/8)