Author: sveinung
Date: Sat May 13 23:24:02 2017
New Revision: 35563
URL: http://svn.gna.org/viewcvs/freeciv?rev=35563&view=rev
Log:
PACKET_WEB_CITY_INFO_ADDITION: be more careful.
Give the packet web_city_info_addition a field with the id of the city the
additional info is for. Cancel it where PACKET_CITY_INFO is canceled.
See hrm Feature #659446
Modified:
trunk/client/packhand.c
trunk/common/networking/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=35563&r1=35562&r2=35563&view=diff
==============================================================================
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Sat May 13 23:24:02 2017
@@ -895,8 +895,8 @@
for it.
TODO: Do not generate code calling this in C-client.
****************************************************************************/
-void handle_web_city_info_addition(int granary_size, int granary_turns,
- int buy_gold_cost)
+void handle_web_city_info_addition(int id, int granary_size,
+ int granary_turns, int buy_gold_cost)
{
}
Modified: trunk/common/networking/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/packets.def?rev=35563&r1=35562&r2=35563&view=diff
==============================================================================
--- trunk/common/networking/packets.def (original)
+++ trunk/common/networking/packets.def Sat May 13 23:24:02 2017
@@ -637,7 +637,7 @@
/************** City packets **********************/
-PACKET_CITY_REMOVE = 30; sc, dsend, lsend, cancel(PACKET_CITY_INFO),
cancel(PACKET_CITY_SHORT_INFO)
+PACKET_CITY_REMOVE = 30; sc, dsend, lsend, cancel(PACKET_CITY_INFO),
cancel(PACKET_WEB_CITY_INFO_ADDITION), cancel(PACKET_CITY_SHORT_INFO)
CITY city_id;
end
@@ -704,7 +704,7 @@
ESTRING name[MAX_LEN_CITYNAME];
end
-PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info, cancel(PACKET_CITY_INFO)
+PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info,
cancel(PACKET_CITY_INFO), cancel(PACKET_WEB_CITY_INFO_ADDITION)
CITY id; key
TILE tile;
@@ -2223,6 +2223,8 @@
/* Use range 256:511 for these */
PACKET_WEB_CITY_INFO_ADDITION = 256; sc, lsend, is-game-info, force,
cancel(PACKET_CITY_SHORT_INFO)
+ CITY id; key
+
UINT16 granary_size;
TURN granary_turns;
UINT16 buy_gold_cost;
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=35563&r1=35562&r2=35563&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Sat May 13 23:24:02 2017
@@ -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.1-2017.May.05"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2017.May.13"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/citytools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=35563&r1=35562&r2=35563&view=diff
==============================================================================
--- trunk/server/citytools.c (original)
+++ trunk/server/citytools.c Sat May 13 23:24:02 2017
@@ -2492,6 +2492,8 @@
} improvement_iterate_end;
#ifdef FREECIV_WEB
+ web_packet->id = pcity->id;
+
web_packet->granary_size = city_granary_size(city_size_get(pcity));
web_packet->granary_turns = city_turns_to_grow(pcity);
web_packet->buy_gold_cost = city_production_buy_gold_cost(pcity);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
