Author: esr
Date: Sun Apr 8 05:53:58 2007
New Revision: 16688
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16688&view=rev
Log:
Deprecate two macros (one never used in mainline, one in HttT only)
because using the makes macroscope unable to validate .ogg references.
Modified:
trunk/data/utils/deprecated-utils.cfg
trunk/data/utils/sound-utils.cfg
Modified: trunk/data/utils/deprecated-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/deprecated-utils.cfg?rev=16688&r1=16687&r2=16688&view=diff
==============================================================================
--- trunk/data/utils/deprecated-utils.cfg (original)
+++ trunk/data/utils/deprecated-utils.cfg Sun Apr 8 05:53:58 2007
@@ -1,22 +1,47 @@
-# These are clutter, scheduled to be removed.
-
-# This one it used to tag macros for removal, the number in the name is the
-# release where the message is shown the first time.
-# The removal will be 2 versions later.
-#define DEPRECATE_132 NAME
- [deprecated_message]
- message="Macro '" + {NAME} + "' is scheduled for removal in
Wesnoth 1.3.4."
- [/deprecated_message]
-#enddef
-
-# Gives a side an amount of gold
-# For example, lets make player 1 rich:
-# {ADD_GOLD 1 999}
-
-#define ADD_GOLD SIDE AMOUNT
- {DEPRECATE_132 ADD_GOLD}
- [gold]
- side={SIDE}
- amount={AMOUNT}
- [/gold]
-#enddef
+# These are clutter, scheduled to be removed.
+
+# This one it used to tag macros for removal, the number in the name is the
+# release where the message is shown the first time.
+# The removal will be 2 versions later.
+#define DEPRECATE_132 NAME
+ [deprecated_message]
+ message="Macro '" + {NAME} + "' is scheduled for removal in
Wesnoth 1.3.4."
+ [/deprecated_message]
+#enddef
+
+# Gives a side an amount of gold
+# For example, lets make player 1 rich:
+# {ADD_GOLD 1 999}
+
+#define ADD_GOLD SIDE AMOUNT
+ {DEPRECATE_132 ADD_GOLD}
+ [gold]
+ side={SIDE}
+ amount={AMOUNT}
+ [/gold]
+#enddef
+
+# Changes the currently playing track to the one specified
+# For example we could switch to underground.ogg:
+# {MUSIC_PLAY underground}
+# (Deprecated because using it breaks macroscope.)
+
+#define MUSIC_PLAY SONG
+ [music]
+ name={SONG}.ogg
+ [/music]
+#enddef
+
+# Adds the given song to the end of the current playlist.
+# For example, lets add wesnoth-01 to the end of the playlist:
+# {MUSIC_APPEND wesnoth-01}
+# (Deprecated because using it breaks macroscope.)
+
+#define MUSIC_APPEND SONG
+ {DEPRECATE_132 MUSIC_APPEND}
+ [music]
+ name={SONG}.ogg
+ append=yes
+ [/music]
+#enddef
+
Modified: trunk/data/utils/sound-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/sound-utils.cfg?rev=16688&r1=16687&r2=16688&view=diff
==============================================================================
--- trunk/data/utils/sound-utils.cfg (original)
+++ trunk/data/utils/sound-utils.cfg Sun Apr 8 05:53:58 2007
@@ -105,27 +105,6 @@
[/event]
#enddef
-# Changes the currently playing track to the one specified
-# For example we could switch to underground.ogg:
-# {MUSIC_PLAY underground}
-
-#define MUSIC_PLAY SONG
- [music]
- name={SONG}.ogg
- [/music]
-#enddef
-
-# Adds the given song to the end of the current playlist.
-# For example, lets add wesnoth-01 to the end of the playlist:
-# {MUSIC_APPEND wesnoth-01}
-
-#define MUSIC_APPEND SONG
- [music]
- name={SONG}.ogg
- append=yes
- [/music]
-#enddef
-
# For some animations some units use a list of sounds, from which one is
# randomly picked every time, instead of a single sound. Here the most commonly
# used lists are wrapped inside macros.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
