Author: cazfi
Date: Sun Feb 14 09:41:03 2016
New Revision: 31909
URL: http://svn.gna.org/viewcvs/freeciv?rev=31909&view=rev
Log:
Added Deprecation Warning event type.
It's not sent in any situation yet.
See patch #6948
Modified:
trunk/client/options.c
trunk/common/events.c
trunk/common/events.h
trunk/data/misc/events.spec
trunk/data/stdsounds.soundspec
trunk/fc_version
Modified: trunk/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=31909&r1=31908&r2=31909&view=diff
==============================================================================
--- trunk/client/options.c (original)
+++ trunk/client/options.c Sun Feb 14 09:41:03 2016
@@ -4852,7 +4852,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: trunk/common/events.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/events.c?rev=31909&r1=31908&r2=31909&view=diff
==============================================================================
--- trunk/common/events.c (original)
+++ trunk/common/events.c Sun Feb 14 09:41:03 2016
@@ -211,6 +211,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_SPONTANEOUS_EXTRA, E_S_XYZZY, N_("Extra Appears or
Disappears")),
GEN_EV(E_UNIT_ILLEGAL_ACTION, E_S_UNIT, N_("Unit Illegal Action")),
GEN_EV(E_UNIT_ESCAPED, E_S_UNIT, N_("Unit escaped"))
Modified: trunk/common/events.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/events.h?rev=31909&r1=31908&r2=31909&view=diff
==============================================================================
--- trunk/common/events.h (original)
+++ trunk/common/events.h Sun Feb 14 09:41:03 2016
@@ -161,6 +161,7 @@
#define SPECENUM_VALUE123 E_UNIT_DID_EXPEL
#define SPECENUM_VALUE124 E_UNIT_ACTION_FAILED
#define SPECENUM_VALUE125 E_UNIT_ESCAPED
+#define SPECENUM_VALUE126 E_DEPRECATION_WARNING
/*
* Note: If you add a new event, make sure you make a similar change
* to the events array in "common/events.c" using GEN_EV, to
Modified: trunk/data/misc/events.spec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.spec?rev=31909&r1=31908&r2=31909&view=diff
==============================================================================
--- trunk/data/misc/events.spec (original)
+++ trunk/data/misc/events.spec Sun Feb 14 09:41:03 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: trunk/data/stdsounds.soundspec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stdsounds.soundspec?rev=31909&r1=31908&r2=31909&view=diff
==============================================================================
--- trunk/data/stdsounds.soundspec (original)
+++ trunk/data/stdsounds.soundspec Sun Feb 14 09:41:03 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: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=31909&r1=31908&r2=31909&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Sun Feb 14 09:41:03 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-3.0-2016.Feb.12b"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Feb.14"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
