Author: sveinung
Date: Mon Jan  5 13:21:58 2015
New Revision: 27530

URL: http://svn.gna.org/viewcvs/freeciv?rev=27530&view=rev
Log:
Number the actions as they appear in the action selection dialog.

This allows a client to auto generate the action selection dialog without
causing the actions to appear in a different order than before. Preserving
the order from old version of Freeciv will be more friendly to users that
upgrades.

There is no need to renumber all actions when future new actions are added
as users of old versions of Freeciv won't have any expectations about were
they are located in the action selection dialog they should appear.

See patch #5654

Modified:
    branches/S2_6/common/actions.h
    branches/S2_6/fc_version

Modified: branches/S2_6/common/actions.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.h?rev=27530&r1=27529&r2=27530&view=diff
==============================================================================
--- branches/S2_6/common/actions.h      (original)
+++ branches/S2_6/common/actions.h      Mon Jan  5 13:21:58 2015
@@ -39,34 +39,34 @@
 
 /* Used in the network protocol. */
 #define SPECENUM_NAME gen_action
-#define SPECENUM_VALUE0 ACTION_SPY_POISON
-#define SPECENUM_VALUE0NAME N_("Poison City")
-#define SPECENUM_VALUE1 ACTION_SPY_SABOTAGE_UNIT
-#define SPECENUM_VALUE1NAME N_("Sabotage Unit")
-#define SPECENUM_VALUE2 ACTION_SPY_BRIBE_UNIT
-#define SPECENUM_VALUE2NAME N_("Bribe Unit")
-#define SPECENUM_VALUE3 ACTION_SPY_SABOTAGE_CITY
-#define SPECENUM_VALUE3NAME N_("Sabotage City")
-#define SPECENUM_VALUE4 ACTION_SPY_TARGETED_SABOTAGE_CITY
-#define SPECENUM_VALUE4NAME N_("Targeted Sabotage City")
-#define SPECENUM_VALUE5 ACTION_SPY_INCITE_CITY
-#define SPECENUM_VALUE5NAME N_("Incite City")
-#define SPECENUM_VALUE6 ACTION_ESTABLISH_EMBASSY
-#define SPECENUM_VALUE6NAME N_("Establish Embassy")
-#define SPECENUM_VALUE7 ACTION_SPY_STEAL_TECH
-#define SPECENUM_VALUE7NAME N_("Steal Tech")
-#define SPECENUM_VALUE8 ACTION_SPY_TARGETED_STEAL_TECH
-#define SPECENUM_VALUE8NAME N_("Targeted Steal Tech")
-#define SPECENUM_VALUE9 ACTION_SPY_INVESTIGATE_CITY
-#define SPECENUM_VALUE9NAME N_("Investigate City")
-#define SPECENUM_VALUE10 ACTION_SPY_STEAL_GOLD
-#define SPECENUM_VALUE10NAME N_("Steal Gold")
-#define SPECENUM_VALUE11 ACTION_TRADE_ROUTE
-#define SPECENUM_VALUE11NAME N_("Establish Trade Route")
-#define SPECENUM_VALUE12 ACTION_MARKETPLACE
-#define SPECENUM_VALUE12NAME N_("Enter Marketplace")
-#define SPECENUM_VALUE13 ACTION_HELP_WONDER
-#define SPECENUM_VALUE13NAME N_("Help Wonder")
+#define SPECENUM_VALUE0 ACTION_ESTABLISH_EMBASSY
+#define SPECENUM_VALUE0NAME N_("Establish Embassy")
+#define SPECENUM_VALUE1 ACTION_SPY_INVESTIGATE_CITY
+#define SPECENUM_VALUE1NAME N_("Investigate City")
+#define SPECENUM_VALUE2 ACTION_SPY_POISON
+#define SPECENUM_VALUE2NAME N_("Poison City")
+#define SPECENUM_VALUE3 ACTION_SPY_STEAL_GOLD
+#define SPECENUM_VALUE3NAME N_("Steal Gold")
+#define SPECENUM_VALUE4 ACTION_SPY_SABOTAGE_CITY
+#define SPECENUM_VALUE4NAME N_("Sabotage City")
+#define SPECENUM_VALUE5 ACTION_SPY_TARGETED_SABOTAGE_CITY
+#define SPECENUM_VALUE5NAME N_("Targeted Sabotage City")
+#define SPECENUM_VALUE6 ACTION_SPY_STEAL_TECH
+#define SPECENUM_VALUE6NAME N_("Steal Tech")
+#define SPECENUM_VALUE7 ACTION_SPY_TARGETED_STEAL_TECH
+#define SPECENUM_VALUE7NAME N_("Targeted Steal Tech")
+#define SPECENUM_VALUE8 ACTION_SPY_INCITE_CITY
+#define SPECENUM_VALUE8NAME N_("Incite City")
+#define SPECENUM_VALUE9 ACTION_TRADE_ROUTE
+#define SPECENUM_VALUE9NAME N_("Establish Trade Route")
+#define SPECENUM_VALUE10 ACTION_MARKETPLACE
+#define SPECENUM_VALUE10NAME N_("Enter Marketplace")
+#define SPECENUM_VALUE11 ACTION_HELP_WONDER
+#define SPECENUM_VALUE11NAME N_("Help Wonder")
+#define SPECENUM_VALUE12 ACTION_SPY_BRIBE_UNIT
+#define SPECENUM_VALUE12NAME N_("Bribe Unit")
+#define SPECENUM_VALUE13 ACTION_SPY_SABOTAGE_UNIT
+#define SPECENUM_VALUE13NAME N_("Sabotage Unit")
 #define SPECENUM_COUNT ACTION_COUNT
 #include "specenum_gen.h"
 

Modified: branches/S2_6/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=27530&r1=27529&r2=27530&view=diff
==============================================================================
--- branches/S2_6/fc_version    (original)
+++ branches/S2_6/fc_version    Mon Jan  5 13:21:58 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.Jan.03"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Jan.05"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


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

Reply via email to