Author: cazfi
Date: Sat Dec 20 20:42:48 2014
New Revision: 27365

URL: http://svn.gna.org/viewcvs/freeciv?rev=27365&view=rev
Log:
Increased maximum number of user defined unit type flags to 32.

Requested by GriffonSpade

See patch #4904

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

Modified: trunk/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=27365&r1=27364&r2=27365&view=diff
==============================================================================
--- trunk/common/unittype.h     (original)
+++ trunk/common/unittype.h     Sat Dec 20 20:42:48 2014
@@ -253,9 +253,25 @@
 #define SPECENUM_VALUE49 UTYF_USER_FLAG_14
 #define SPECENUM_VALUE50 UTYF_USER_FLAG_15
 #define SPECENUM_VALUE51 UTYF_USER_FLAG_16
+#define SPECENUM_VALUE52 UTYF_USER_FLAG_17
+#define SPECENUM_VALUE53 UTYF_USER_FLAG_18
+#define SPECENUM_VALUE54 UTYF_USER_FLAG_19
+#define SPECENUM_VALUE55 UTYF_USER_FLAG_20
+#define SPECENUM_VALUE56 UTYF_USER_FLAG_21
+#define SPECENUM_VALUE57 UTYF_USER_FLAG_22
+#define SPECENUM_VALUE58 UTYF_USER_FLAG_23
+#define SPECENUM_VALUE59 UTYF_USER_FLAG_24
+#define SPECENUM_VALUE60 UTYF_USER_FLAG_25
+#define SPECENUM_VALUE61 UTYF_USER_FLAG_26
+#define SPECENUM_VALUE62 UTYF_USER_FLAG_27
+#define SPECENUM_VALUE63 UTYF_USER_FLAG_28
+#define SPECENUM_VALUE64 UTYF_USER_FLAG_29
+#define SPECENUM_VALUE65 UTYF_USER_FLAG_30
+#define SPECENUM_VALUE66 UTYF_USER_FLAG_31
+#define SPECENUM_VALUE67 UTYF_USER_FLAG_32
 /* Note that first role must have value next to last flag */
 
-#define UTYF_LAST_USER_FLAG UTYF_USER_FLAG_16
+#define UTYF_LAST_USER_FLAG UTYF_USER_FLAG_32
 #define MAX_NUM_USER_UNIT_FLAGS (UTYF_LAST_USER_FLAG - UTYF_USER_FLAG_1 + 1)
 #define SPECENUM_NAMEOVERRIDE
 #define SPECENUM_BITVECTOR bv_unit_type_flags
@@ -277,74 +293,74 @@
 
 #define SPECENUM_NAME unit_role_id
 /* is built first when city established */
-#define SPECENUM_VALUE52 L_FIRSTBUILD
-#define SPECENUM_VALUE52NAME N_("FirstBuild")
+#define SPECENUM_VALUE68 L_FIRSTBUILD
+#define SPECENUM_VALUE68NAME N_("FirstBuild")
 /* initial explorer unit */
-#define SPECENUM_VALUE53 L_EXPLORER
-#define SPECENUM_VALUE53NAME N_("Explorer")
+#define SPECENUM_VALUE69 L_EXPLORER
+#define SPECENUM_VALUE69NAME N_("Explorer")
 /* can be found in hut */
-#define SPECENUM_VALUE54 L_HUT
-#define SPECENUM_VALUE54NAME N_("Hut")
+#define SPECENUM_VALUE70 L_HUT
+#define SPECENUM_VALUE70NAME N_("Hut")
 /* can be found in hut, global tech required */
-#define SPECENUM_VALUE55 L_HUT_TECH
-#define SPECENUM_VALUE55NAME N_("HutTech")
+#define SPECENUM_VALUE71 L_HUT_TECH
+#define SPECENUM_VALUE71NAME N_("HutTech")
 /* is created in Partisan circumstances */
-#define SPECENUM_VALUE56 L_PARTISAN
-#define SPECENUM_VALUE56NAME N_("Partisan")
+#define SPECENUM_VALUE72 L_PARTISAN
+#define SPECENUM_VALUE72NAME N_("Partisan")
 /* ok on defense (AI) */
-#define SPECENUM_VALUE57 L_DEFEND_OK
-#define SPECENUM_VALUE57NAME N_("DefendOk")
+#define SPECENUM_VALUE73 L_DEFEND_OK
+#define SPECENUM_VALUE73NAME N_("DefendOk")
 /* primary purpose is defense (AI) */
-#define SPECENUM_VALUE58 L_DEFEND_GOOD
-#define SPECENUM_VALUE58NAME N_("DefendGood")
+#define SPECENUM_VALUE74 L_DEFEND_GOOD
+#define SPECENUM_VALUE74NAME N_("DefendGood")
 /* quick attacking unit (Horse..Armor) (unused)*/
-#define SPECENUM_VALUE59 L_ATTACK_FAST
-#define SPECENUM_VALUE59NAME N_("AttackFast")
+#define SPECENUM_VALUE75 L_ATTACK_FAST
+#define SPECENUM_VALUE75NAME N_("AttackFast")
 /* powerful attacking unit (Catapult..) (unused) */
-#define SPECENUM_VALUE60 L_ATTACK_STRONG
-#define SPECENUM_VALUE60NAME N_("AttackStrong")
+#define SPECENUM_VALUE76 L_ATTACK_STRONG
+#define SPECENUM_VALUE76NAME N_("AttackStrong")
 /* is useful for ferrying (AI) */
-#define SPECENUM_VALUE61 L_FERRYBOAT
-#define SPECENUM_VALUE61NAME N_("FerryBoat")
+#define SPECENUM_VALUE77 L_FERRYBOAT
+#define SPECENUM_VALUE77NAME N_("FerryBoat")
 /* barbarians unit, land only */
-#define SPECENUM_VALUE62 L_BARBARIAN
-#define SPECENUM_VALUE62NAME N_("Barbarian")
+#define SPECENUM_VALUE78 L_BARBARIAN
+#define SPECENUM_VALUE78NAME N_("Barbarian")
 /* barbarians unit, global tech required */
-#define SPECENUM_VALUE63 L_BARBARIAN_TECH
-#define SPECENUM_VALUE63NAME N_("BarbarianTech")
+#define SPECENUM_VALUE79 L_BARBARIAN_TECH
+#define SPECENUM_VALUE79NAME N_("BarbarianTech")
 /* barbarian boat */
-#define SPECENUM_VALUE64 L_BARBARIAN_BOAT
-#define SPECENUM_VALUE64NAME N_("BarbarianBoat")
+#define SPECENUM_VALUE80 L_BARBARIAN_BOAT
+#define SPECENUM_VALUE80NAME N_("BarbarianBoat")
 /* what barbarians should build */
-#define SPECENUM_VALUE65 L_BARBARIAN_BUILD
-#define SPECENUM_VALUE65NAME N_("BarbarianBuild")
+#define SPECENUM_VALUE81 L_BARBARIAN_BUILD
+#define SPECENUM_VALUE81NAME N_("BarbarianBuild")
 /* barbarians build when global tech */
-#define SPECENUM_VALUE66 L_BARBARIAN_BUILD_TECH
-#define SPECENUM_VALUE66NAME N_("BarbarianBuildTech")
+#define SPECENUM_VALUE82 L_BARBARIAN_BUILD_TECH
+#define SPECENUM_VALUE82NAME N_("BarbarianBuildTech")
 /* barbarian leader */
-#define SPECENUM_VALUE67 L_BARBARIAN_LEADER
-#define SPECENUM_VALUE67NAME N_("BarbarianLeader")
+#define SPECENUM_VALUE83 L_BARBARIAN_LEADER
+#define SPECENUM_VALUE83NAME N_("BarbarianLeader")
 /* sea raider unit */
-#define SPECENUM_VALUE68 L_BARBARIAN_SEA
-#define SPECENUM_VALUE68NAME N_("BarbarianSea")
+#define SPECENUM_VALUE84 L_BARBARIAN_SEA
+#define SPECENUM_VALUE84NAME N_("BarbarianSea")
 /* sea raider unit, global tech required */
-#define SPECENUM_VALUE69 L_BARBARIAN_SEA_TECH
-#define SPECENUM_VALUE69NAME N_("BarbarianSeaTech")
+#define SPECENUM_VALUE85 L_BARBARIAN_SEA_TECH
+#define SPECENUM_VALUE85NAME N_("BarbarianSeaTech")
 /* can found cities */
-#define SPECENUM_VALUE70 L_CITIES
-#define SPECENUM_VALUE70NAME N_("Cities")
+#define SPECENUM_VALUE86 L_CITIES
+#define SPECENUM_VALUE86NAME N_("Cities")
 /* can improve terrain */
-#define SPECENUM_VALUE71 L_SETTLERS
-#define SPECENUM_VALUE71NAME N_("Settlers")
+#define SPECENUM_VALUE87 L_SETTLERS
+#define SPECENUM_VALUE87NAME N_("Settlers")
 /* loss results in loss of game */
-#define SPECENUM_VALUE72 L_GAMELOSS
-#define SPECENUM_VALUE72NAME N_("GameLoss")
+#define SPECENUM_VALUE88 L_GAMELOSS
+#define SPECENUM_VALUE88NAME N_("GameLoss")
 /* can do diplomat actions */
-#define SPECENUM_VALUE73 L_DIPLOMAT
-#define SPECENUM_VALUE73NAME N_("Diplomat")
+#define SPECENUM_VALUE89 L_DIPLOMAT
+#define SPECENUM_VALUE89NAME N_("Diplomat")
 /* AI hunter type unit */
-#define SPECENUM_VALUE74 L_HUNTER
-#define SPECENUM_VALUE74NAME N_("Hunter")
+#define SPECENUM_VALUE90 L_HUNTER
+#define SPECENUM_VALUE90NAME N_("Hunter")
 #define L_LAST (L_HUNTER+1)
 
 #include "specenum_gen.h"

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=27365&r1=27364&r2=27365&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Sat Dec 20 20:42:48 2014
@@ -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-2014.Dec.17b"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2014.Dec.20"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


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

Reply via email to