Author: cazfi
Date: Wed Mar 25 19:40:33 2015
New Revision: 28624

URL: http://svn.gna.org/viewcvs/freeciv?rev=28624&view=rev
Log:
Made limit of number of road and base types as big as total number of extras. 
So, effectively,
there's only one limit of max number of extras.

See patch #5945

Modified:
    trunk/common/fc_types.h
    trunk/fc_version

Modified: trunk/common/fc_types.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=28624&r1=28623&r2=28624&view=diff
==============================================================================
--- trunk/common/fc_types.h     (original)
+++ trunk/common/fc_types.h     Wed Mar 25 19:40:33 2015
@@ -43,9 +43,9 @@
 #define MAX_LEN_VET_SHORT_NAME 8
 /* Used in the network protocol. See diplomat_success_vs_defender() */
 #define MAX_VET_LEVELS 20
-#define MAX_BASE_TYPES 32 /* Used in the network protocol. */
-#define MAX_ROAD_TYPES 16 /* Used in the network protocol. */
-#define MAX_EXTRA_TYPES (16 + MAX_BASE_TYPES + MAX_ROAD_TYPES)
+#define MAX_EXTRA_TYPES 64 /* Used in the network protocol. */
+#define MAX_BASE_TYPES MAX_EXTRA_TYPES /* Used in the network protocol. */
+#define MAX_ROAD_TYPES MAX_EXTRA_TYPES /* Used in the network protocol. */
 #define MAX_DISASTER_TYPES 10
 #define MAX_ACHIEVEMENT_TYPES 10
 #define MAX_NUM_LEADERS MAX_NUM_ITEMS /* Used in the network protocol. */

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=28624&r1=28623&r2=28624&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Wed Mar 25 19:40:33 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.Mar.24b"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Mar.25"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


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

Reply via email to