From: Marek Moeckel <wansti@gmx.de>
Date: Fri, 9 May 2008 12:44:31 +0000 (+0000)
Subject: added .music script for fortress music
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1618a32a4bbbbaa578486ac4959fe9f6ed33665b;p=supertux.git

added .music script for fortress music
moved some unused-and-probably-never-to-be-used music files to trunk/media

SVN-Revision: 5451
---

diff --git a/data/levels/bonus1/bonus-level4.stl b/data/levels/bonus1/bonus-level4.stl
index 5a1aca71f..f8a1c8fa9 100644
--- a/data/levels/bonus1/bonus-level4.stl
+++ b/data/levels/bonus1/bonus-level4.stl
@@ -4,7 +4,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (bouncingsnowball
       (x 10013)
diff --git a/data/levels/bonus1/matr1x-level3.stl b/data/levels/bonus1/matr1x-level3.stl
index fa3ad9ff3..8303dbb1d 100644
--- a/data/levels/bonus1/matr1x-level3.stl
+++ b/data/levels/bonus1/matr1x-level3.stl
@@ -4,7 +4,7 @@
   (author "Matr1x")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (bouncingsnowball
       (x 8331)
diff --git a/data/levels/bonus2/level1.stl b/data/levels/bonus2/level1.stl
index 5d9c5d023..02da4e8d8 100644
--- a/data/levels/bonus2/level1.stl
+++ b/data/levels/bonus2/level1.stl
@@ -4,7 +4,7 @@
   (author "Kevin")
   (sector
     (name "main")
-    (music "music/fortress2.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (background
       (speed 0.5)
diff --git a/data/levels/bonus2/level13.stl b/data/levels/bonus2/level13.stl
index 5a63ac883..c93d65f15 100644
--- a/data/levels/bonus2/level13.stl
+++ b/data/levels/bonus2/level13.stl
@@ -4,7 +4,7 @@
   (author "Thomas Nilsen")
   (sector
     (name "main")
-    (music "music/fortress2.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (background
       (speed 0.5)
diff --git a/data/levels/bonus2/level20.stl b/data/levels/bonus2/level20.stl
index 333b19889..69397a6f5 100644
--- a/data/levels/bonus2/level20.stl
+++ b/data/levels/bonus2/level20.stl
@@ -4,7 +4,7 @@
   (author "Marek Moeckel")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (background
       (speed 0.5)
diff --git a/data/levels/bonus2/level21.stl b/data/levels/bonus2/level21.stl
index 2cd9a843d..94c8793a4 100644
--- a/data/levels/bonus2/level21.stl
+++ b/data/levels/bonus2/level21.stl
@@ -4,7 +4,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (gravity 8)
     (ambient-light 1 1 1)
     (camera
diff --git a/data/levels/bonus2/level8.stl b/data/levels/bonus2/level8.stl
index 7cccb9b83..f01038358 100644
--- a/data/levels/bonus2/level8.stl
+++ b/data/levels/bonus2/level8.stl
@@ -4,7 +4,7 @@
   (author "Kevin")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (background
       (speed 0.5)
diff --git a/data/levels/world1/22 - A Mysterious House of Ice.stl b/data/levels/world1/22 - A Mysterious House of Ice.stl
index f639cf30e..85451897b 100644
--- a/data/levels/world1/22 - A Mysterious House of Ice.stl	
+++ b/data/levels/world1/22 - A Mysterious House of Ice.stl	
@@ -5,7 +5,7 @@
   (license "GPL 2+ / CC-by-sa 3.0")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (background
       (speed 0.5)
diff --git a/data/levels/world1/26 - The Castle of Nolok.stl b/data/levels/world1/26 - The Castle of Nolok.stl
index ce06ea520..87de63474 100644
--- a/data/levels/world1/26 - The Castle of Nolok.stl	
+++ b/data/levels/world1/26 - The Castle of Nolok.stl	
@@ -5,7 +5,7 @@
   (license "GPL 2+ / CC-by-sa 3.0")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 1 1 1)
     (bouncingsnowball
       (x 6456)
diff --git a/data/levels/world2/christoph5.stl b/data/levels/world2/christoph5.stl
index 74f8a0040..6f43aef70 100644
--- a/data/levels/world2/christoph5.stl
+++ b/data/levels/world2/christoph5.stl
@@ -5,7 +5,7 @@
   (license "GPL 2+ / CC-by-sa 3.0")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (init-script "droptrap_fired <- false;")
     (ambient-light 1 1 1)
     (background
diff --git a/data/levels/world2/christophC.stl b/data/levels/world2/christophC.stl
index b79664955..2adc87e7e 100644
--- a/data/levels/world2/christophC.stl
+++ b/data/levels/world2/christophC.stl
@@ -5,7 +5,7 @@
   (license "GPL 2+ / CC-by-sa 3.0")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 0.0957351 0.04943923 0.04943923)
     (background
       (speed 0.5)
diff --git a/data/levels/world2/christophD.stl b/data/levels/world2/christophD.stl
index 52a8fb167..67a13d045 100644
--- a/data/levels/world2/christophD.stl
+++ b/data/levels/world2/christophD.stl
@@ -5,7 +5,7 @@
   (license "GPL 2+ / CC-by-sa 3.0")
   (sector
     (name "main")
-    (music "music/fortress.ogg")
+    (music "music/fortress.music")
     (ambient-light 0.4390478 0.2466926 0.1758755)
     (background
       (y 1100)
diff --git a/data/music/fortress.music b/data/music/fortress.music
new file mode 100644
index 000000000..b88d0d434
--- /dev/null
+++ b/data/music/fortress.music
@@ -0,0 +1,5 @@
+(supertux-music
+  (file "fortress.ogg")
+  (loop-begin 11.37)
+  (loop-at    -1)
+)
diff --git a/data/music/fortress2.ogg b/data/music/fortress2.ogg
deleted file mode 100644
index 1c2bdf787..000000000
Binary files a/data/music/fortress2.ogg and /dev/null differ
diff --git a/data/music/gameover_castle.ogg b/data/music/gameover_castle.ogg
deleted file mode 100644
index e98477df3..000000000
Binary files a/data/music/gameover_castle.ogg and /dev/null differ
diff --git a/data/music/gameover_forest.ogg b/data/music/gameover_forest.ogg
deleted file mode 100644
index d77772562..000000000
Binary files a/data/music/gameover_forest.ogg and /dev/null differ
diff --git a/data/music/gameover_ghostforest.ogg b/data/music/gameover_ghostforest.ogg
deleted file mode 100644
index 4e48532b6..000000000
Binary files a/data/music/gameover_ghostforest.ogg and /dev/null differ
diff --git a/data/music/leveldone-special.ogg b/data/music/leveldone-special.ogg
deleted file mode 100644
index 251f72817..000000000
Binary files a/data/music/leveldone-special.ogg and /dev/null differ