Author: esr
Date: Sat Apr  7 09:03:12 2007
New Revision: 16668

URL: http://svn.gna.org/viewcvs/wesnoth?rev=16668&view=rev
Log:
Utils macros reorganized for new topic separations.

Modified:
    trunk/data/utils/image-utils.cfg
    trunk/data/utils/interface-utils.cfg
    trunk/data/utils/sound-utils.cfg

Modified: trunk/data/utils/image-utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/image-utils.cfg?rev=16668&r1=16667&r2=16668&view=diff
==============================================================================
--- trunk/data/utils/image-utils.cfg (original)
+++ trunk/data/utils/image-utils.cfg Sat Apr  7 09:03:12 2007
@@ -51,31 +51,6 @@
     [/item]
 #enddef
 
-#define TREMOR
-    [sound]
-    name="rumble.ogg"
-    [/sound]
-    [scroll]
-        x=5
-        y=0
-    [/scroll]
-    [scroll]
-        x=-10
-        y=0
-    [/scroll]
-    [scroll]
-        x=5
-        y=5
-    [/scroll]
-    [scroll]
-        x=0
-        y=-10
-    [/scroll]
-    [scroll]
-        x=0
-        y=5
-    [/scroll]
-#enddef
 
 
 

Modified: trunk/data/utils/interface-utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/interface-utils.cfg?rev=16668&r1=16667&r2=16668&view=diff
==============================================================================
--- trunk/data/utils/interface-utils.cfg (original)
+++ trunk/data/utils/interface-utils.cfg Sat Apr  7 09:03:12 2007
@@ -16,27 +16,6 @@
     [/message]
 #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
-
 # Scrolls the screen to the given coordinates.
 # For example, lets focus on 26,35:
 # {SCROLL 26 35}
@@ -123,6 +102,34 @@
     [scroll]
         x={X}
         y={Y}
+    [/scroll]
+#enddef
+
+# Visuals and sound for an earth tremor.
+
+#define TREMOR
+    [sound]
+    name="rumble.ogg"
+    [/sound]
+    [scroll]
+        x=5
+        y=0
+    [/scroll]
+    [scroll]
+        x=-10
+        y=0
+    [/scroll]
+    [scroll]
+        x=5
+        y=5
+    [/scroll]
+    [scroll]
+        x=0
+        y=-10
+    [/scroll]
+    [scroll]
+        x=0
+        y=5
     [/scroll]
 #enddef
 

Modified: trunk/data/utils/sound-utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/sound-utils.cfg?rev=16668&r1=16667&r2=16668&view=diff
==============================================================================
--- trunk/data/utils/sound-utils.cfg (original)
+++ trunk/data/utils/sound-utils.cfg Sat Apr  7 09:03:12 2007
@@ -105,6 +105,27 @@
 [/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

Reply via email to