Author: cazfi Date: Wed Dec 9 22:13:18 2015 New Revision: 30923 URL: http://svn.gna.org/viewcvs/freeciv?rev=30923&view=rev Log: Send information about traderoute goods to client
See patch #6660 Modified: trunk/client/packhand.c trunk/common/packets.def trunk/fc_version trunk/server/citytools.c Modified: trunk/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=30923&r1=30922&r2=30923&view=diff ============================================================================== --- trunk/client/packhand.c (original) +++ trunk/client/packhand.c Wed Dec 9 22:13:18 2015 @@ -1005,6 +1005,7 @@ proute->partner = packet->partner; proute->value = packet->value; proute->dir = packet->direction; + proute->goods = goods_by_number(packet->goods); if (gui_options.draw_city_trade_routes && city_changed) { update_city_description(pcity); Modified: trunk/common/packets.def URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=30923&r1=30922&r2=30923&view=diff ============================================================================== --- trunk/common/packets.def (original) +++ trunk/common/packets.def Wed Dec 9 22:13:18 2015 @@ -301,6 +301,7 @@ type TILE = SINT32 type UNIT = UINT16 type UNIT_TYPE = uint8(Unit_type_id) +type GOODS = uint8(Goods_type_id) # other typedefs type CITY_COORD = UINT8 @@ -700,6 +701,7 @@ CITY partner; UINT8 value; RDIR direction; + GOODS goods; end PACKET_CITY_SELL = 33; cs, dsend Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=30923&r1=30922&r2=30923&view=diff ============================================================================== --- trunk/fc_version (original) +++ trunk/fc_version Wed Dec 9 22:13:18 2015 @@ -54,7 +54,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-2015.Dec.07" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Dec.09" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" Modified: trunk/server/citytools.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=30923&r1=30922&r2=30923&view=diff ============================================================================== --- trunk/server/citytools.c (original) +++ trunk/server/citytools.c Wed Dec 9 22:13:18 2015 @@ -2295,7 +2295,7 @@ int i; int ppl = 0; - packet->id=pcity->id; + packet->id = pcity->id; packet->owner = player_number(city_owner(pcity)); packet->tile = tile_index(city_tile(pcity)); sz_strlcpy(packet->name, city_name(pcity)); @@ -2384,6 +2384,7 @@ tri_packet->partner = proute->partner; tri_packet->value = proute->value; tri_packet->direction = proute->dir; + tri_packet->goods = goods_number(proute->goods); traderoute_packet_list_append(routes, tri_packet); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits