Author: cazfi
Date: Wed Mar 25 19:40:39 2015
New Revision: 28625
URL: http://svn.gna.org/viewcvs/freeciv?rev=28625&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:
branches/S2_6/common/fc_types.h
branches/S2_6/fc_version
Modified: branches/S2_6/common/fc_types.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/fc_types.h?rev=28625&r1=28624&r2=28625&view=diff
==============================================================================
--- branches/S2_6/common/fc_types.h (original)
+++ branches/S2_6/common/fc_types.h Wed Mar 25 19:40:39 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: branches/S2_6/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=28625&r1=28624&r2=28625&view=diff
==============================================================================
--- branches/S2_6/fc_version (original)
+++ branches/S2_6/fc_version Wed Mar 25 19:40:39 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-2.6-2015.Mar.22"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2015.Mar.25"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
