[Freeciv-commits] r29704 - /trunk/common/packets.def

[sveinung84]

Author: sveinung
Date: Fri Aug 28 12:54:26 2015
New Revision: 29704

URL: http://svn.gna.org/viewcvs/freeciv?rev=29704&view=rev
Log:
protocol: change city name type to estring

Freeciv-web escapes city names using URI encoding. Set the type of all city
name fields to estring.

See patch #6296

Modified:
    trunk/common/packets.def

Modified: trunk/common/packets.def
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=29704&r1=29703&r2=29704&view=diff
==============================================================================
--- trunk/common/packets.def    (original)
+++ trunk/common/packets.def    Fri Aug 28 12:54:26 2015
@@ -200,6 +200,8 @@
 type UNIT_LIST          = unit_list(int)
 type BUILDING_LIST      = building_list(int)
 type WORKLIST           = worklist(struct worklist)
+# string that is URI encoded in the JSON protocol
+type ESTRING            = estring(char)
 
 # typedefs for enums
 type ACTIVITY           = uint8(enum unit_activity)
@@ -652,7 +654,7 @@
 
   BV_IMPRS improvements;
   BV_CITY_OPTIONS city_options;
-  STRING name[MAX_LEN_NAME];
+  ESTRING name[MAX_LEN_NAME];
 end
 
 PACKET_CITY_SHORT_INFO = 32; sc, lsend, is-game-info, cancel(PACKET_CITY_INFO)
@@ -672,7 +674,7 @@
   SINT8 city_image;
 
   BV_IMPRS improvements;
-  STRING name[MAX_LEN_NAME];
+  ESTRING name[MAX_LEN_NAME];
 end
 
 PACKET_TRADEROUTE_INFO = 249; sc, lsend, handle-via-packet
@@ -720,7 +722,7 @@
 
 PACKET_CITY_RENAME = 40; cs, dsend
   CITY city_id;
-  STRING name[MAX_LEN_NAME];
+  ESTRING name[MAX_LEN_NAME];
 end
 
 PACKET_CITY_OPTIONS_REQ = 41; cs, dsend
@@ -744,7 +746,7 @@
 
 PACKET_CITY_NAME_SUGGESTION_INFO = 44; sc, dsend, lsend
   UNIT unit_id;
-  STRING name[MAX_LEN_NAME];
+  ESTRING name[MAX_LEN_NAME];
 end
 
 PACKET_CITY_SABOTAGE_LIST = 45; sc, lsend
@@ -1017,7 +1019,7 @@
   UNIT actor_id;
   SINT32 target_id;   # city_id, unit_id or tile_id
   SINT16 value;
-  STRING name[MAX_LEN_NAME];
+  ESTRING name[MAX_LEN_NAME];
   GEN_ACTION action_type;
 end
 
@@ -2021,7 +2023,7 @@
 
 PACKET_EDIT_CITY = 213; cs, handle-per-conn, handle-via-packet
   CITY id; key
-  STRING name[MAX_LEN_NAME];
+  ESTRING name[MAX_LEN_NAME];
   PLAYER owner;
   PLAYER original;
   UINT8 size;


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits