Author: cazfi
Date: Sun Feb 14 09:41:19 2016
New Revision: 31910

URL: http://svn.gna.org/viewcvs/freeciv?rev=31910&view=rev
Log:
Added Deprecation Warning event type.
It's not sent in any situation yet.

See patch #6948

Modified:
    branches/S2_6/client/options.c
    branches/S2_6/common/events.c
    branches/S2_6/common/events.h
    branches/S2_6/data/misc/events.spec
    branches/S2_6/data/stdsounds.soundspec
    branches/S2_6/fc_version

Modified: branches/S2_6/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=31910&r1=31909&r2=31910&view=diff
==============================================================================
--- branches/S2_6/client/options.c      (original)
+++ branches/S2_6/client/options.c      Sun Feb 14 09:41:19 2016
@@ -4604,7 +4604,7 @@
     E_LOG_ERROR, E_SETTING, E_VOTE_NEW, E_VOTE_RESOLVED, E_VOTE_ABORTED
   };
   int all[] = {
-    E_LOG_FATAL, E_SCRIPT
+    E_LOG_FATAL, E_SCRIPT, E_DEPRECATION_WARNING
   };
   int i;
 

Modified: branches/S2_6/common/events.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/events.c?rev=31910&r1=31909&r2=31910&view=diff
==============================================================================
--- branches/S2_6/common/events.c       (original)
+++ branches/S2_6/common/events.c       Sun Feb 14 09:41:19 2016
@@ -204,6 +204,7 @@
   GEN_EV(E_SCRIPT,             E_S_XYZZY,      N_("Scenario/ruleset script 
message")),
   /* TRANS: Event name for when the game year changes. */
   GEN_EV(E_NEXT_YEAR,          E_S_XYZZY,      N_("Year Advance")),
+  GEN_EV(E_DEPRECATION_WARNING, E_S_XYZZY,     N_("Deprecated Modpack syntax 
warnings")),
   GEN_EV(E_UNIT_ILLEGAL_ACTION, E_S_UNIT,       N_("Unit Illegal Action"))
   /* The sound system also generates "e_game_quit", although there's no
    * corresponding identifier E_GAME_QUIT. */

Modified: branches/S2_6/common/events.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/events.h?rev=31910&r1=31909&r2=31910&view=diff
==============================================================================
--- branches/S2_6/common/events.h       (original)
+++ branches/S2_6/common/events.h       Sun Feb 14 09:41:19 2016
@@ -152,6 +152,7 @@
 #define SPECENUM_VALUE114 E_MY_SPY_STEAL_GOLD
 #define SPECENUM_VALUE115 E_ENEMY_SPY_STEAL_GOLD
 #define SPECENUM_VALUE116 E_UNIT_ILLEGAL_ACTION
+#define SPECENUM_VALUE117 E_DEPRECATION_WARNING
 
 /*
  * Note: If you add a new event, make sure you make a similar change

Modified: branches/S2_6/data/misc/events.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/events.spec?rev=31910&r1=31909&r2=31910&view=diff
==============================================================================
--- branches/S2_6/data/misc/events.spec (original)
+++ branches/S2_6/data/misc/events.spec Sun Feb 14 09:41:19 2016
@@ -56,6 +56,7 @@
   1,  2, "e_report"
   1,  2, "e_chat_msg"
   1,  2, "e_log_error"
+  1,  2, "e_deprecation_warning"
   1,  3, "e_log_fatal"
   1,  3, "e_chat_error"
 

Modified: branches/S2_6/data/stdsounds.soundspec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stdsounds.soundspec?rev=31910&r1=31909&r2=31910&view=diff
==============================================================================
--- branches/S2_6/data/stdsounds.soundspec      (original)
+++ branches/S2_6/data/stdsounds.soundspec      Sun Feb 14 09:41:19 2016
@@ -195,6 +195,7 @@
 
 
 ; This list contains all events up to E_ACHIEVEMENT
+; and at least some of the later ones (E_DEPRECATION_WARNING)
 ; (as numbered in common/events.h), in the sorted order.
 ; Alphabetical sorting is based on these tag names,
 ; as the message names and contents change. {was}
@@ -227,6 +228,7 @@
 ;e_city_plague = ""
 ;e_civil_war = ""
 ;e_connection = ""
+;e_deprecation_warning = ""
 ;e_destroyed = ""
 ;e_diplomacy = ""
 ;e_diplomatic_incident = ""

Modified: branches/S2_6/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=31910&r1=31909&r2=31910&view=diff
==============================================================================
--- branches/S2_6/fc_version    (original)
+++ branches/S2_6/fc_version    Sun Feb 14 09:41:19 2016
@@ -55,7 +55,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-2016.Feb.12"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Feb.14"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


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

Reply via email to