music and image paths in levels are now absolute (from datadir)

SVN-Revision: 3023

diff --git a/data/levels/bonus1/abednego-level1.stl b/data/levels/bonus1/abednego-level1.stl
index b5c4df9..9c04822 100644 (file)
--- a/data/levels/bonus1/abednego-level1.stl
+++ b/data/levels/bonus1/abednego-level1.stl
@@ -5,7 +5,7 @@
   (author "Abednego")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/abednego-level2.stl b/data/levels/bonus1/abednego-level2.stl
index f872901..63987cf 100644 (file)
--- a/data/levels/bonus1/abednego-level2.stl
+++ b/data/levels/bonus1/abednego-level2.stl
@@ -5,7 +5,7 @@
   (author "Abednego")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/abednego-level3.stl b/data/levels/bonus1/abednego-level3.stl
index e1f5da0..d05d804 100644 (file)
--- a/data/levels/bonus1/abednego-level3.stl
+++ b/data/levels/bonus1/abednego-level3.stl
@@ -5,7 +5,7 @@
   (author "Abednego")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/abednego-level4.stl b/data/levels/bonus1/abednego-level4.stl
index 53d03da..b108c1a 100644 (file)
--- a/data/levels/bonus1/abednego-level4.stl
+++ b/data/levels/bonus1/abednego-level4.stl
@@ -5,7 +5,7 @@
   (author "Abednego")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "ocean.jpg")
+      (image "images/background/ocean.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/bonus-level1.stl b/data/levels/bonus1/bonus-level1.stl
index 3321b97..bbab57a 100644 (file)
--- a/data/levels/bonus1/bonus-level1.stl
+++ b/data/levels/bonus1/bonus-level1.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/bonus-level2.stl b/data/levels/bonus1/bonus-level2.stl
index 910da24..caecceb 100644 (file)
--- a/data/levels/bonus1/bonus-level2.stl
+++ b/data/levels/bonus1/bonus-level2.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/bonus-level3.stl b/data/levels/bonus1/bonus-level3.stl
index 9caeb91..f3841b3 100644 (file)
--- a/data/levels/bonus1/bonus-level3.stl
+++ b/data/levels/bonus1/bonus-level3.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/bonus-level4.stl b/data/levels/bonus1/bonus-level4.stl
index 5d6bde1..44fa56d 100644 (file)
--- a/data/levels/bonus1/bonus-level4.stl
+++ b/data/levels/bonus1/bonus-level4.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "fortress2.ogg")
+    (music "music/fortress2.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/bonus-level5.stl b/data/levels/bonus1/bonus-level5.stl
index 3dc7f5e..87dbb53 100644 (file)
--- a/data/levels/bonus1/bonus-level5.stl
+++ b/data/levels/bonus1/bonus-level5.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/extro.txt b/data/levels/bonus1/extro.txt
index 7616866..45b1f9c 100644 (file)
--- a/data/levels/bonus1/extro.txt
+++ b/data/levels/bonus1/extro.txt
@@ -1,5 +1,5 @@
 (supertux-text
-  (background "arctis.jpg")
+  (background "images/background/arctis.jpg")
   (text (_ "-Congratulations!
 
 #You have successfully finished

diff --git a/data/levels/bonus1/matr1x-level1.stl b/data/levels/bonus1/matr1x-level1.stl
index 5d8af1d..94114da 100644 (file)
--- a/data/levels/bonus1/matr1x-level1.stl
+++ b/data/levels/bonus1/matr1x-level1.stl
@@ -5,7 +5,7 @@
   (author "matr1x")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/matr1x-level2.stl b/data/levels/bonus1/matr1x-level2.stl
index fe0f9db..f972bd0 100644 (file)
--- a/data/levels/bonus1/matr1x-level2.stl
+++ b/data/levels/bonus1/matr1x-level2.stl
@@ -5,7 +5,7 @@
   (author "Matr1x")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/matr1x-level3.stl b/data/levels/bonus1/matr1x-level3.stl
index 38684b9..5d1e852 100644 (file)
--- a/data/levels/bonus1/matr1x-level3.stl
+++ b/data/levels/bonus1/matr1x-level3.stl
@@ -5,7 +5,7 @@
   (author "Matr1x")
   (sector
     (name "main")
-    (music "fortress.ogg")
+    (music "music/fortress.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/thompson-level1.stl b/data/levels/bonus1/thompson-level1.stl
index 31233ec..7aea982 100644 (file)
--- a/data/levels/bonus1/thompson-level1.stl
+++ b/data/levels/bonus1/thompson-level1.stl
@@ -5,7 +5,7 @@
   (author "Jason Thompson")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/thompson-level2.stl b/data/levels/bonus1/thompson-level2.stl
index fd79429..62ecc86 100644 (file)
--- a/data/levels/bonus1/thompson-level2.stl
+++ b/data/levels/bonus1/thompson-level2.stl
@@ -6,7 +6,7 @@
   (author "Jason W. Thompson")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -81,7 +81,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/torfi-level1.stl b/data/levels/bonus1/torfi-level1.stl
index b1f9447..826c055 100644 (file)
--- a/data/levels/bonus1/torfi-level1.stl
+++ b/data/levels/bonus1/torfi-level1.stl
@@ -5,7 +5,7 @@
   (author "Torfi Gunnarsson")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/torfi-level2.stl b/data/levels/bonus1/torfi-level2.stl
index 794a71f..1eb2c11 100644 (file)
--- a/data/levels/bonus1/torfi-level2.stl
+++ b/data/levels/bonus1/torfi-level2.stl
@@ -5,7 +5,7 @@
   (author "Torfi Gunnarsson")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/torfi-level3.stl b/data/levels/bonus1/torfi-level3.stl
index 7c71ae9..b713a8b 100644 (file)
--- a/data/levels/bonus1/torfi-level3.stl
+++ b/data/levels/bonus1/torfi-level3.stl
@@ -5,7 +5,7 @@
   (author "Torfi Gunnarsson")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/wansti-level1.stl b/data/levels/bonus1/wansti-level1.stl
index 1f48626..12a5807 100644 (file)
--- a/data/levels/bonus1/wansti-level1.stl
+++ b/data/levels/bonus1/wansti-level1.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/wansti-level2.stl b/data/levels/bonus1/wansti-level2.stl
index 2a6afd6..8249a42 100644 (file)
--- a/data/levels/bonus1/wansti-level2.stl
+++ b/data/levels/bonus1/wansti-level2.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/wansti-level3.stl b/data/levels/bonus1/wansti-level3.stl
index a6f6270..8a27162 100644 (file)
--- a/data/levels/bonus1/wansti-level3.stl
+++ b/data/levels/bonus1/wansti-level3.stl
@@ -6,7 +6,7 @@
   ;(hor_autoscroll_speed 1)
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/wansti-level4.stl b/data/levels/bonus1/wansti-level4.stl
index 2b31ddd..2b527a7 100644 (file)
--- a/data/levels/bonus1/wansti-level4.stl
+++ b/data/levels/bonus1/wansti-level4.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus1/wansti-level5.stl b/data/levels/bonus1/wansti-level5.stl
index 67e7544..5bfacf6 100644 (file)
--- a/data/levels/bonus1/wansti-level5.stl
+++ b/data/levels/bonus1/wansti-level5.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus1/worldmap.stwm b/data/levels/bonus1/worldmap.stwm
index 533e969..fb00806 100644 (file)
--- a/data/levels/bonus1/worldmap.stwm
+++ b/data/levels/bonus1/worldmap.stwm
@@ -2,7 +2,7 @@
 (supertux-worldmap
   (properties
     (name (_ "Bonus Island I"))
-    (music "salcon.ogg")
+    (music "music/salcon.ogg")
   )
   (spawnpoint
     (name "main")

diff --git a/data/levels/bonus2/extro.txt b/data/levels/bonus2/extro.txt
index 57807a4..32fb97d 100644 (file)
--- a/data/levels/bonus2/extro.txt
+++ b/data/levels/bonus2/extro.txt
@@ -1,5 +1,5 @@
 (supertux-text
-  (background "arctis.jpg")
+  (background "images/background/arctis.jpg")
   (text (_ "-Congratulations!
 
 #You successfully made it through

diff --git a/data/levels/bonus2/level1.stl b/data/levels/bonus2/level1.stl
index de14973..88ab3f9 100644 (file)
--- a/data/levels/bonus2/level1.stl
+++ b/data/levels/bonus2/level1.stl
@@ -5,7 +5,7 @@
   (author "Kevin")\r
   (sector\r
     (name "main")\r
-    (music "fortress2.ogg")\r
+    (music "music/fortress2.ogg")\r
     (gravity 10.0)\r
     (tilemap\r
       (layer "background")\r
@@ -38,7 +38,7 @@
       )\r
     )\r
     (background\r
-      (image "ocean.jpg")\r
+      (image "images/background/ocean.jpg")\r
       (speed 0.5)\r
     )\r
     (leveltime\r

diff --git a/data/levels/bonus2/level10.stl b/data/levels/bonus2/level10.stl
index 543269b..6624919 100644 (file)
--- a/data/levels/bonus2/level10.stl
+++ b/data/levels/bonus2/level10.stl
@@ -5,7 +5,7 @@
   (author "Thomas")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level11.stl b/data/levels/bonus2/level11.stl
index c2b9556..5589d6e 100644 (file)
--- a/data/levels/bonus2/level11.stl
+++ b/data/levels/bonus2/level11.stl
@@ -5,7 +5,7 @@
   (author "Torfi Gunnarsson")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity  10.0)
     (tilemap
       (layer "background")
@@ -77,7 +77,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level12.stl b/data/levels/bonus2/level12.stl
index 262b836..e9649e2 100644 (file)
--- a/data/levels/bonus2/level12.stl
+++ b/data/levels/bonus2/level12.stl
@@ -5,7 +5,7 @@
   (author "Daniel Alston")\r
   (sector\r
     (name "main")\r
-    (music "chipdisko.ogg")\r
+    (music "music/chipdisko.ogg")\r
     (gravity 10.0)\r
     (tilemap\r
       (layer "background")\r
@@ -38,7 +38,7 @@
       )\r
     )\r
     (background\r
-      (image "arctis.jpg")\r
+      (image "images/background/arctis.jpg")\r
       (speed 0.5)\r
     )\r
     (leveltime\r

diff --git a/data/levels/bonus2/level13.stl b/data/levels/bonus2/level13.stl
index 65f3449..419cb36 100644 (file)
--- a/data/levels/bonus2/level13.stl
+++ b/data/levels/bonus2/level13.stl
@@ -5,7 +5,7 @@
   (author "Thomas Nilsen")
   (sector
     (name "main")
-    (music "fortress2.ogg")
+    (music "music/fortress2.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level14.stl b/data/levels/bonus2/level14.stl
index 8559daa..c1ae216 100644 (file)
--- a/data/levels/bonus2/level14.stl
+++ b/data/levels/bonus2/level14.stl
@@ -5,7 +5,7 @@
   (author "Nilrok")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level15.stl b/data/levels/bonus2/level15.stl
index 3ab8263..1c7dad4 100644 (file)
--- a/data/levels/bonus2/level15.stl
+++ b/data/levels/bonus2/level15.stl
@@ -5,7 +5,7 @@
   (author "Nilrok")
   (sector
     (name "main")
-    (music "salcon.ogg")
+    (music "music/salcon.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level16.stl b/data/levels/bonus2/level16.stl
index b3d4d2b..e44587c 100644 (file)
--- a/data/levels/bonus2/level16.stl
+++ b/data/levels/bonus2/level16.stl
@@ -5,7 +5,7 @@
   (author "Corlin Heydman")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity  10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level17.stl b/data/levels/bonus2/level17.stl
index 7c8e06d..07f0ca2 100644 (file)
--- a/data/levels/bonus2/level17.stl
+++ b/data/levels/bonus2/level17.stl
@@ -6,7 +6,7 @@
   (author "Marek Moeckel")
   (sector
     (name "main")
-    (music "theme.ogg")
+    (music "music/theme.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level18.stl b/data/levels/bonus2/level18.stl
index ade6194..da0486e 100644 (file)
--- a/data/levels/bonus2/level18.stl
+++ b/data/levels/bonus2/level18.stl
@@ -6,7 +6,7 @@
   (author "Marek Moeckel")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -81,7 +81,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level19.stl b/data/levels/bonus2/level19.stl
index 555c22e..e884f3d 100644 (file)
--- a/data/levels/bonus2/level19.stl
+++ b/data/levels/bonus2/level19.stl
@@ -5,7 +5,7 @@
   (author "Marek Moeckel")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level2.stl b/data/levels/bonus2/level2.stl
index f8ef781..6831f0f 100644 (file)
--- a/data/levels/bonus2/level2.stl
+++ b/data/levels/bonus2/level2.stl
@@ -5,7 +5,7 @@
   (author "Kevin")\r
   (sector\r
     (name "main")\r
-    (music "cave.ogg")\r
+    (music "music/cave.ogg")\r
     (gravity 10.0)\r
     (tilemap\r
       (layer "background")\r
@@ -38,7 +38,7 @@
       )\r
     )\r
     (background\r
-      (image "cave2.jpg")\r
+      (image "images/background/cave2.jpg")\r
       (speed 0.5)\r
     )\r
     (leveltime\r

diff --git a/data/levels/bonus2/level20.stl b/data/levels/bonus2/level20.stl
index f4cd00a..fad139b 100644 (file)
--- a/data/levels/bonus2/level20.stl
+++ b/data/levels/bonus2/level20.stl
@@ -7,7 +7,7 @@
   ;(time  180)
   (sector
     (name "main")
-    (music "fortress2.ogg")
+    (music "music/fortress2.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -82,7 +82,7 @@
       )
     )
     (background
-      (image "arctis_dark.jpg")
+      (image "images/background/arctis_dark.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level21.stl b/data/levels/bonus2/level21.stl
index d397bd7..91f5ca2 100644 (file)
--- a/data/levels/bonus2/level21.stl
+++ b/data/levels/bonus2/level21.stl
@@ -5,7 +5,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "fortress.ogg")
+    (music "music/fortress.ogg")
     (gravity 8.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level22.stl b/data/levels/bonus2/level22.stl
index a6aaeaa..7403d38 100644 (file)
--- a/data/levels/bonus2/level22.stl
+++ b/data/levels/bonus2/level22.stl
@@ -5,7 +5,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level23.stl b/data/levels/bonus2/level23.stl
index 6166bcf..0d0f0d1 100644 (file)
--- a/data/levels/bonus2/level23.stl
+++ b/data/levels/bonus2/level23.stl
@@ -5,7 +5,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (particles-snow

diff --git a/data/levels/bonus2/level24.stl b/data/levels/bonus2/level24.stl
index e0a3ea7..7bd38ea 100644 (file)
--- a/data/levels/bonus2/level24.stl
+++ b/data/levels/bonus2/level24.stl
@@ -6,7 +6,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level25.stl b/data/levels/bonus2/level25.stl
index 26e4d72..3b977ca 100644 (file)
--- a/data/levels/bonus2/level25.stl
+++ b/data/levels/bonus2/level25.stl
@@ -5,7 +5,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 15.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level26.stl b/data/levels/bonus2/level26.stl
index 1a3a1c4..c3a2ff9 100644 (file)
--- a/data/levels/bonus2/level26.stl
+++ b/data/levels/bonus2/level26.stl
@@ -5,7 +5,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "ocean.jpg")
+      (image "images/background/ocean.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level27.stl b/data/levels/bonus2/level27.stl
index b3f968a..6cc1b6d 100644 (file)
--- a/data/levels/bonus2/level27.stl
+++ b/data/levels/bonus2/level27.stl
@@ -5,7 +5,7 @@
   (author "Penguinmaster")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level28.stl b/data/levels/bonus2/level28.stl
index c270885..34f0c85 100644 (file)
--- a/data/levels/bonus2/level28.stl
+++ b/data/levels/bonus2/level28.stl
@@ -5,7 +5,7 @@
   (author "Marek Moeckel")
   (sector
     (name "main")
-    (music "salcon.ogg")
+    (music "music/salcon.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level3.stl b/data/levels/bonus2/level3.stl
index b078fa6..c8b9ae7 100644 (file)
--- a/data/levels/bonus2/level3.stl
+++ b/data/levels/bonus2/level3.stl
@@ -5,7 +5,7 @@
   (author "Jason Kleinemas")
   (sector
     (name "main")
-    (music "theme.ogg")
+    (music "music/theme.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -79,7 +79,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level4.stl b/data/levels/bonus2/level4.stl
index 57f46ea..cea0e83 100644 (file)
--- a/data/levels/bonus2/level4.stl
+++ b/data/levels/bonus2/level4.stl
@@ -6,7 +6,7 @@
   (author "Jason Kleinemas")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -39,7 +39,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level5.stl b/data/levels/bonus2/level5.stl
index e27d5e9..f380870 100644 (file)
--- a/data/levels/bonus2/level5.stl
+++ b/data/levels/bonus2/level5.stl
@@ -5,7 +5,7 @@
   (author "Denilson")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -52,7 +52,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.3)
     )
     (leveltime

diff --git a/data/levels/bonus2/level6.stl b/data/levels/bonus2/level6.stl
index f184a36..c528ca3 100644 (file)
--- a/data/levels/bonus2/level6.stl
+++ b/data/levels/bonus2/level6.stl
@@ -5,7 +5,7 @@
   (author "Tobe Deprez")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/bonus2/level7.stl b/data/levels/bonus2/level7.stl
index 6eac0df..bb2dfd0 100644 (file)
--- a/data/levels/bonus2/level7.stl
+++ b/data/levels/bonus2/level7.stl
@@ -5,7 +5,7 @@
   (author "Kevin")\r
   (sector\r
     (name "main")\r
-    (music "chipdisko.ogg")\r
+    (music "music/chipdisko.ogg")\r
     (gravity 10.0)\r
     (tilemap\r
       (layer "background")\r
@@ -38,7 +38,7 @@
       )\r
     )\r
     (background\r
-      (image "arctis.jpg")\r
+      (image "images/background/arctis.jpg")\r
       (speed 0.5)\r
     )\r
     (leveltime\r

diff --git a/data/levels/bonus2/level8.stl b/data/levels/bonus2/level8.stl
index 3a641eb..56f0048 100644 (file)
--- a/data/levels/bonus2/level8.stl
+++ b/data/levels/bonus2/level8.stl
@@ -5,7 +5,7 @@
   (author "Kevin")
   (sector
     (name "main")
-    (music "fortress.ogg")
+    (music "music/fortress.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -80,7 +80,7 @@
       )
     )
     (background
-      (image "ocean.jpg")
+      (image "images/background/ocean.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/level9.stl b/data/levels/bonus2/level9.stl
index a693848..6a7413b 100644 (file)
--- a/data/levels/bonus2/level9.stl
+++ b/data/levels/bonus2/level9.stl
@@ -5,7 +5,7 @@
   (author "Big c")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -38,7 +38,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/bonus2/worldmap.stwm b/data/levels/bonus2/worldmap.stwm
index f358195..6a39c00 100644 (file)
--- a/data/levels/bonus2/worldmap.stwm
+++ b/data/levels/bonus2/worldmap.stwm
@@ -2,7 +2,7 @@
 (supertux-worldmap
   (properties
     (name  (_ "Bonus Island II"))
-    (music "salcon.ogg")
+    (music "music/salcon.ogg")
   )
   (spawnpoint
     (name "main")

diff --git a/data/levels/misc/menu.stl b/data/levels/misc/menu.stl
index eb57c88..8b00d12 100644 (file)
--- a/data/levels/misc/menu.stl
+++ b/data/levels/misc/menu.stl
@@ -5,9 +5,9 @@
   (author "SuperTux Team")
   (sector
     (name  "main")
-    (music  "theme.ogg")
+    (music  "music/theme.ogg")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/arctis.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")

diff --git a/data/levels/test/ambient_sound.stl b/data/levels/test/ambient_sound.stl
index 38a2846..6b01af6 100644 (file)
--- a/data/levels/test/ambient_sound.stl
+++ b/data/levels/test/ambient_sound.stl
@@ -125,11 +125,11 @@
     )
 
        (background
-         (image "arctis.jpg")
+         (image "images/background/arctis.jpg")
          (speed 0.500000)
        )
        (background
-         (image "arctis.jpg")
+         (image "images/background/arctis.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 96) (y 160))

diff --git a/data/levels/test/animtiles.stl b/data/levels/test/animtiles.stl
index f645e3a..ed712c8 100644 (file)
--- a/data/levels/test/animtiles.stl
+++ b/data/levels/test/animtiles.stl
@@ -9,7 +9,7 @@
     (width  30)
     (height  20)
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/arctis.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")

diff --git a/data/levels/test/autoscroll.stl b/data/levels/test/autoscroll.stl
index 1ab8d0a..2ae1a87 100644 (file)
--- a/data/levels/test/autoscroll.stl
+++ b/data/levels/test/autoscroll.stl
@@ -120,7 +120,7 @@
      )
 
        (background
-         (image "semi_arctic.jpg")
+         (image "images/background/semi_arctic.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 96) (y 160))

diff --git a/data/levels/test/bonus-level4.stl b/data/levels/test/bonus-level4.stl
index 072f81f..d101fd6 100644 (file)
--- a/data/levels/test/bonus-level4.stl
+++ b/data/levels/test/bonus-level4.stl
@@ -164,7 +164,7 @@
        (jumpy (x 15063) (y 268))
        (spawnpoint (name "main") (x 96) (y 96))
        (background
-         (image "arctis_dark.jpg")
+         (image "images/background/arctis_dark.jpg")
          (speed 0.500000)
        )
    )

diff --git a/data/levels/test/bonusblock.stl b/data/levels/test/bonusblock.stl
index 33dcff6..d2c8dca 100644 (file)
--- a/data/levels/test/bonusblock.stl
+++ b/data/levels/test/bonusblock.stl
@@ -126,11 +126,11 @@
     )
 
        (background
-         (image "arctis.jpg")
+         (image "images/background/arctis.jpg")
          (speed 0.500000)
        )
        (background
-         (image "arctis.jpg")
+         (image "images/background/arctis.jpg")
          (speed 0.500000)
        )
        (powerup (x 135) (y 600) (sprite "egg"))

diff --git a/data/levels/test/easteregg.stl b/data/levels/test/easteregg.stl
index ac81ac3..90395b5 100644 (file)
--- a/data/levels/test/easteregg.stl
+++ b/data/levels/test/easteregg.stl
@@ -10,9 +10,9 @@
     (height  30)
     (music  "forest2.ogg")
     (gravity 10.000000)
-    (background (image "forest1.jpg")
+    (background (image "images/background/forest1.jpg")
                 (speed 0.5))
-    (background (image "fog.png")
+    (background (image "images/background/fog.png")
                 (speed 1.2)
                (layer 400))
     (spawnpoint (name "main")

diff --git a/data/levels/test/endseq.stl b/data/levels/test/endseq.stl
index 1bd9e5a..453e184 100644 (file)
--- a/data/levels/test/endseq.stl
+++ b/data/levels/test/endseq.stl
@@ -8,7 +8,7 @@
   (start_pos_x    100)
   (start_pos_y    100)
   (background "arctis.jpg")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (bkgd_red_top    150)
   (bkgd_green_top  150)
   (bkgd_blue_top   150)

diff --git a/data/levels/test/enemy3.stl b/data/levels/test/enemy3.stl
index 2b54d47..d1f4fe8 100644 (file)
--- a/data/levels/test/enemy3.stl
+++ b/data/levels/test/enemy3.stl
@@ -8,7 +8,7 @@
   (start_pos_x    100)
   (start_pos_y    100)
   (background "arctis.jpg")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (bkgd_red_top    150)
   (bkgd_green_top  150)
   (bkgd_blue_top   150)

diff --git a/data/levels/test/exit.stl b/data/levels/test/exit.stl
index 3a406ce..008a4c2 100644 (file)
--- a/data/levels/test/exit.stl
+++ b/data/levels/test/exit.stl
@@ -6,7 +6,7 @@
   (width  100)
   (height 15)
   (background "arctis.jpg")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (bkgd_red    150)
   (bkgd_green  200)
   (bkgd_blue   255)

diff --git a/data/levels/test/flapping.stl b/data/levels/test/flapping.stl
index 8480638..ae81f97 100644 (file)
--- a/data/levels/test/flapping.stl
+++ b/data/levels/test/flapping.stl
@@ -8,7 +8,7 @@
   (start_pos_x    100)
   (start_pos_y    100)
   (background "arctis.jpg")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (bkgd_red_top    150)
   (bkgd_green_top  200)
   (bkgd_blue_top   255)

diff --git a/data/levels/test/forest1-grumbel.stl b/data/levels/test/forest1-grumbel.stl
index 27c4eac..c2f6f1f 100644 (file)
--- a/data/levels/test/forest1-grumbel.stl
+++ b/data/levels/test/forest1-grumbel.stl
@@ -8,11 +8,11 @@
     (name  "main")
     (width  100)
     (height  50)
-    (music "forest.ogg")
+    (music "music/forest.ogg")
     (gravity 10.000000)
-    (background (image "forest1.jpg")
+    (background (image "images/background/forest1.jpg")
                 (speed 0.5))
-    (background (image "fog.png")
+    (background (image "images/background/fog.png")
                     (speed 1.2)
                     (layer 400))
     (tilemap

diff --git a/data/levels/test/forestkeep.stl b/data/levels/test/forestkeep.stl
index b408d6e..9fc8b82 100644 (file)
--- a/data/levels/test/forestkeep.stl
+++ b/data/levels/test/forestkeep.stl
@@ -186,7 +186,7 @@
     )
 
        (background
-         (image "arctis_dark.jpg")
+         (image "images/background/arctis_dark.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 64) (y 320))

diff --git a/data/levels/test/foresttheme.stl b/data/levels/test/foresttheme.stl
index e45ee19..ae65b13 100644 (file)
--- a/data/levels/test/foresttheme.stl
+++ b/data/levels/test/foresttheme.stl
@@ -7,7 +7,7 @@
   (sector
     (name "main")
     (gravity 10)
-    (music "forest2.ogg")
+    (music "music/forest2.ogg")
     (spawnpoint
       (name "main")
       (x 100)
@@ -19,7 +19,7 @@
       (y 201)
     )
     (background
-      (image "forest1.jpg")
+      (image "images/background/forest1.jpg")
       (speed 0.005)
     )
     (tilemap

diff --git a/data/levels/test/glitches.stl b/data/levels/test/glitches.stl
index 149f7e5..e800f73 100644 (file)
--- a/data/levels/test/glitches.stl
+++ b/data/levels/test/glitches.stl
@@ -3,7 +3,7 @@
   (version 1)
   (name "Sliding Glitches Demo")
   (author "Marek")
-  (music "cave.ogg")
+  (music "music/cave.ogg")
   (background "cave2.jpg")
   (particle_system "")
   (bkgd_speed 50)

diff --git a/data/levels/test/intro.stl b/data/levels/test/intro.stl
index 4a4f1f1..b93450e 100644 (file)
--- a/data/levels/test/intro.stl
+++ b/data/levels/test/intro.stl
@@ -96,7 +96,7 @@
     )
 
        (background
-         (image "semi_arctic.jpg")
+         (image "images/background/semi_arctic.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 220) (y 416))

diff --git a/data/levels/test/intro2.stl b/data/levels/test/intro2.stl
index 523da5d..65ac896 100644 (file)
--- a/data/levels/test/intro2.stl
+++ b/data/levels/test/intro2.stl
@@ -6,7 +6,7 @@
   (sector
     (name  "main")
     (init-script "intro()")
-    (music "intro.ogg")
+    (music "music/intro.ogg")
     (gravity 10.000000)
     (tilemap
       (layer  "background")

diff --git a/data/levels/test/invisible_blocks.stl b/data/levels/test/invisible_blocks.stl
index 52dba06..01695b4 100644 (file)
--- a/data/levels/test/invisible_blocks.stl
+++ b/data/levels/test/invisible_blocks.stl
@@ -9,7 +9,7 @@
     (width  100)
     (height  50)
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/arctis.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")

diff --git a/data/levels/test/kugelblitz.stl b/data/levels/test/kugelblitz.stl
index d346514..3fb8cb2 100644 (file)
--- a/data/levels/test/kugelblitz.stl
+++ b/data/levels/test/kugelblitz.stl
@@ -99,7 +99,7 @@
        )
        (spawnpoint (name "main") (x 2496) (y 128))
        (background
-         (image "ghostforest.jpg")
+         (image "images/background/ghostforest.jpg")
          (speed 1.000000)
        )
        (poisonivy (x 800) (y 440))

diff --git a/data/levels/test/light.stl b/data/levels/test/light.stl
index c6cabc4..c19971f 100644 (file)
--- a/data/levels/test/light.stl
+++ b/data/levels/test/light.stl
@@ -3,7 +3,7 @@
   (version 1)
   (name "One Block Fall-through / Spikes")
   (author "")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (background "arctis.jpg")
   (particle_system "")
   (bkgd_speed 50)

diff --git a/data/levels/test/mrtree.stl b/data/levels/test/mrtree.stl
index cf78c77..4b4d11e 100644 (file)
--- a/data/levels/test/mrtree.stl
+++ b/data/levels/test/mrtree.stl
@@ -8,9 +8,9 @@
     (name  "main")
     (width  100)
     (height  50)
-    (music "forest.ogg")
+    (music "music/forest.ogg")
     (gravity 10.000000)
-    (background (image "forest1.jpg")
+    (background (image "images/background/forest1.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")

diff --git a/data/levels/test/noloktest.stl b/data/levels/test/noloktest.stl
index b9c136b..edce5e3 100644 (file)
--- a/data/levels/test/noloktest.stl
+++ b/data/levels/test/noloktest.stl
@@ -7,9 +7,9 @@
   (sector
     (name "main")
     (gravity 10)
-    (background (image "arctis_dark.jpg")
+    (background (image "images/background/arctis_dark.jpg")
                 (speed 0.5))
-    (music "bossattack.ogg")
+    (music "music/bossattack.ogg")
     (spawnpoint (name "main") (x 100) (y 100))
     (nolok_01 (x 650) (y 512))
     (tilemap
@@ -44,8 +44,8 @@
   (sector
     (name "sector1")
     (gravity 10)
-    (music "chipdisko.ogg")
-    (background (image "forest1.jpg")
+    (music "music/chipdisko.ogg")
+    (background (image "images/background/forest1.jpg")
                 (speed 0.5))
     (spawnpoint (name "main2") (x 100) (y 100))
     (secretarea (x 100) (y 100) (message "You found a secret area!"))

diff --git a/data/levels/test/platform.stl b/data/levels/test/platform.stl
index dbf6197..9bee198 100644 (file)
--- a/data/levels/test/platform.stl
+++ b/data/levels/test/platform.stl
@@ -125,7 +125,7 @@
     )
 
        (background
-         (image "arctis.jpg")
+         (image "images/background/arctis.jpg")
          (speed 0.500000)
        )
    (path (name "path1") (circular #t) (speed 100) (x 0) (y 0) (x 0) (y -100) (x 100) (y -100) (x 100) (y 0))

diff --git a/data/levels/test/raintest.stl b/data/levels/test/raintest.stl
index 79b1b84..a7b5d4a 100644 (file)
--- a/data/levels/test/raintest.stl
+++ b/data/levels/test/raintest.stl
@@ -6,7 +6,7 @@
   (sector
     (name  "main")
     (gravity 10.000000)
-    (music "ghostforest.ogg")
+    (music "music/ghostforest.ogg")
     (tilemap
       (layer  "background")
       (solid #f)
@@ -186,11 +186,11 @@
     )
 
        (background
-         (image "ghostforest.jpg")
+         (image "images/background/ghostforest.jpg")
          (speed 0.5)
        )
        (background
-         (image "fog.png")
+         (image "images/background/fog.png")
         (speed 1.2)
         (layer 400)
        )

diff --git a/data/levels/test/script.stl b/data/levels/test/script.stl
index 875877e..8a275bf 100644 (file)
--- a/data/levels/test/script.stl
+++ b/data/levels/test/script.stl
@@ -96,7 +96,7 @@
     )
 
        (background
-         (image "semi_arctic.jpg")
+         (image "images/background/semi_arctic.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 320) (y 416))

diff --git a/data/levels/test/sectors.stl b/data/levels/test/sectors.stl
index af8f931..477792d 100644 (file)
--- a/data/levels/test/sectors.stl
+++ b/data/levels/test/sectors.stl
@@ -7,7 +7,7 @@
   (sector
     (name  "main")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/arctis.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")
@@ -84,7 +84,7 @@
 
        (spawnpoint (name "main") (x 96) (y 160))
        (background
-         (image "arctis.jpg")
+         (image "images/background/arctis.jpg")
          (speed 0.500000)
        )
        (door
@@ -107,7 +107,7 @@
   (sector
     (name  "another_world")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/arctis.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")
@@ -739,7 +739,7 @@
 
        (trampoline (x 1900) (y 1500))
        (background
-         (image "cave2.jpg")
+         (image "images/background/cave2.jpg")
          (speed 0.500000)
        )
        (door

diff --git a/data/levels/test/simple.stl b/data/levels/test/simple.stl
index e53acb5..c16c763 100644 (file)
--- a/data/levels/test/simple.stl
+++ b/data/levels/test/simple.stl
@@ -7,7 +7,7 @@
   (sector
     (name  "main")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/arctis.jpg")
                 (speed 0.5))
     (spawnpoint (name "main") (x 150) (y 100))
     (rock (x 50) (y 50))

diff --git a/data/levels/test/slopes.stl b/data/levels/test/slopes.stl
index b13a33b..ed03ed1 100644 (file)
--- a/data/levels/test/slopes.stl
+++ b/data/levels/test/slopes.stl
@@ -3,7 +3,7 @@
   (version 1)
   (name "Slope/Platform Test")
   (author "Ingo Ruhnke")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (background "")
   (particle_system "")
   (bkgd_speed 50)

diff --git a/data/levels/test/spikes.stl b/data/levels/test/spikes.stl
index ed9ce49..1887dd3 100644 (file)
--- a/data/levels/test/spikes.stl
+++ b/data/levels/test/spikes.stl
@@ -3,7 +3,7 @@
   (version 1)
   (name "One Block Fall-through / Spikes")
   (author "")
-  (music "chipdisko.ogg")
+  (music "music/chipdisko.ogg")
   (background "arctis.jpg")
   (particle_system "")
   (bkgd_speed 50)

diff --git a/data/levels/test/vertical.stl b/data/levels/test/vertical.stl
index 141847e..7932cf4 100644 (file)
--- a/data/levels/test/vertical.stl
+++ b/data/levels/test/vertical.stl
@@ -8,7 +8,7 @@
   (start_pos_x    100)
   (start_pos_y    170)
   (background "cave2.jpg")
-  (music "forest.ogg")
+  (music "music/forest.ogg")
   (bkgd_red_top    150)
   (bkgd_green_top  200)
   (bkgd_blue_top   255)

diff --git a/data/levels/test/verticalforest.stl b/data/levels/test/verticalforest.stl
index 07427a4..3db5b1f 100644 (file)
--- a/data/levels/test/verticalforest.stl
+++ b/data/levels/test/verticalforest.stl
@@ -8,7 +8,7 @@
   (start_pos_x    100)
   (start_pos_y    100)
   (background "forest1.jpg")
-  (music "forest.ogg")
+  (music "music/forest.ogg")
   (bkgd_red_top    150)
   (bkgd_green_top  200)
   (bkgd_blue_top   255)

diff --git a/data/levels/test/wansti-level4.stl b/data/levels/test/wansti-level4.stl
index 4dce54f..4e1dbec 100644 (file)
--- a/data/levels/test/wansti-level4.stl
+++ b/data/levels/test/wansti-level4.stl
@@ -160,7 +160,7 @@
        (mrbomb (x 10713) (y 301))
        (spawnpoint (name "main") (x 96) (y 96))
        (background
-         (image "cave2.jpg")
+         (image "images/background/cave2.jpg")
          (speed 0.500000)
        )
              (bonusblock (x 160) (y 288)

diff --git a/data/levels/test/yeti.stl b/data/levels/test/yeti.stl
index 0c2635e..ef8f432 100644 (file)
--- a/data/levels/test/yeti.stl
+++ b/data/levels/test/yeti.stl
@@ -96,7 +96,7 @@
     )
 
        (background
-         (image "semi_arctic.jpg")
+         (image "images/background/semi_arctic.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 480) (y 448))

diff --git a/data/levels/world1/extro.txt b/data/levels/world1/extro.txt
index a7c6cba..72dca8b 100644 (file)
--- a/data/levels/world1/extro.txt
+++ b/data/levels/world1/extro.txt
@@ -1,7 +1,7 @@
 ; Ending text
 (supertux-text
   (background "extro.jpg")
-  (music "theme.ogg")
+  (music "music/theme.ogg")
   (show-after "CREDITS")
 
   (text (_ "-Entering Nolok's Throne Room!

diff --git a/data/levels/world1/intro.stl b/data/levels/world1/intro.stl
index 40ad261..5198205 100644 (file)
--- a/data/levels/world1/intro.stl
+++ b/data/levels/world1/intro.stl
@@ -96,7 +96,7 @@
     )
 
        (background
-         (image "semi_arctic.jpg")
+         (image "images/background/semi_arctic.jpg")
          (speed 0.500000)
        )
        (spawnpoint (name "main") (x 320) (y 416))

diff --git a/data/levels/world1/level1.stl b/data/levels/world1/level1.stl
index 65857e3..64a21aa 100644 (file)
--- a/data/levels/world1/level1.stl
+++ b/data/levels/world1/level1.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level10.stl b/data/levels/world1/level10.stl
index 56c5c0a..252af2c 100644 (file)
--- a/data/levels/world1/level10.stl
+++ b/data/levels/world1/level10.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level11.stl b/data/levels/world1/level11.stl
index 8b20bb9..0ced77a 100644 (file)
--- a/data/levels/world1/level11.stl
+++ b/data/levels/world1/level11.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/world1/level12.stl b/data/levels/world1/level12.stl
index 041121f..b1b7bb6 100644 (file)
--- a/data/levels/world1/level12.stl
+++ b/data/levels/world1/level12.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/world1/level13.stl b/data/levels/world1/level13.stl
index 10dfae3..1cdf049 100644 (file)
--- a/data/levels/world1/level13.stl
+++ b/data/levels/world1/level13.stl
@@ -7,7 +7,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/world1/level14.stl b/data/levels/world1/level14.stl
index f11965c..8c60862 100644 (file)
--- a/data/levels/world1/level14.stl
+++ b/data/levels/world1/level14.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level15.stl b/data/levels/world1/level15.stl
index 4459226..f92f0d7 100644 (file)
--- a/data/levels/world1/level15.stl
+++ b/data/levels/world1/level15.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level16.stl b/data/levels/world1/level16.stl
index 115e8f4..a0a98c2 100644 (file)
--- a/data/levels/world1/level16.stl
+++ b/data/levels/world1/level16.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level17.stl b/data/levels/world1/level17.stl
index b55250e..a110528 100644 (file)
--- a/data/levels/world1/level17.stl
+++ b/data/levels/world1/level17.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level18.stl b/data/levels/world1/level18.stl
index ff31e55..eacffdb 100644 (file)
--- a/data/levels/world1/level18.stl
+++ b/data/levels/world1/level18.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level19.stl b/data/levels/world1/level19.stl
index 9bfe50b..3c63e09 100644 (file)
--- a/data/levels/world1/level19.stl
+++ b/data/levels/world1/level19.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level2.stl b/data/levels/world1/level2.stl
index 0e5facf..c4b6be9 100644 (file)
--- a/data/levels/world1/level2.stl
+++ b/data/levels/world1/level2.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level20.stl b/data/levels/world1/level20.stl
index 384888b..4555f72 100644 (file)
--- a/data/levels/world1/level20.stl
+++ b/data/levels/world1/level20.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "cave.ogg")
+    (music "music/cave.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "cave2.jpg")
+      (image "images/background/cave2.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level21.stl b/data/levels/world1/level21.stl
index c8988f6..1d71929 100644 (file)
--- a/data/levels/world1/level21.stl
+++ b/data/levels/world1/level21.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level22.stl b/data/levels/world1/level22.stl
index d404c2b..a8a3d76 100644 (file)
--- a/data/levels/world1/level22.stl
+++ b/data/levels/world1/level22.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "fortress.ogg")
+    (music "music/fortress.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -92,7 +92,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level23.stl b/data/levels/world1/level23.stl
index 05f1241..b079603 100644 (file)
--- a/data/levels/world1/level23.stl
+++ b/data/levels/world1/level23.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level24.stl b/data/levels/world1/level24.stl
index 9a37b1a..1dc8fd9 100644 (file)
--- a/data/levels/world1/level24.stl
+++ b/data/levels/world1/level24.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "ocean.jpg")
+      (image "images/background/ocean.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level25.stl b/data/levels/world1/level25.stl
index 0141ed3..eb5ab79 100644 (file)
--- a/data/levels/world1/level25.stl
+++ b/data/levels/world1/level25.stl
@@ -7,7 +7,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -94,7 +94,7 @@
       )
     )
     (background
-      (image "ocean.jpg")
+      (image "images/background/ocean.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level26.stl b/data/levels/world1/level26.stl
index 8e010aa..23bd522 100644 (file)
--- a/data/levels/world1/level26.stl
+++ b/data/levels/world1/level26.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "fortress.ogg")
+    (music "music/fortress.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")

diff --git a/data/levels/world1/level3.stl b/data/levels/world1/level3.stl
index 892694d..3e71d92 100644 (file)
--- a/data/levels/world1/level3.stl
+++ b/data/levels/world1/level3.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level4.stl b/data/levels/world1/level4.stl
index cd6df6a..ef5e9ac 100644 (file)
--- a/data/levels/world1/level4.stl
+++ b/data/levels/world1/level4.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level5.stl b/data/levels/world1/level5.stl
index 7918e44..f5db259 100644 (file)
--- a/data/levels/world1/level5.stl
+++ b/data/levels/world1/level5.stl
@@ -6,7 +6,7 @@
   (author "Philippe Saint-Pierre")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level6.stl b/data/levels/world1/level6.stl
index eded6ae..a728abb 100644 (file)
--- a/data/levels/world1/level6.stl
+++ b/data/levels/world1/level6.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level7.stl b/data/levels/world1/level7.stl
index f49fca5..3e25075 100644 (file)
--- a/data/levels/world1/level7.stl
+++ b/data/levels/world1/level7.stl
@@ -6,7 +6,7 @@
   (author "Voluptuous Pachyderm")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level8.stl b/data/levels/world1/level8.stl
index fe9c009..a40da5e 100644 (file)
--- a/data/levels/world1/level8.stl
+++ b/data/levels/world1/level8.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/level9.stl b/data/levels/world1/level9.stl
index b8f8fa5..83b8bfc 100644 (file)
--- a/data/levels/world1/level9.stl
+++ b/data/levels/world1/level9.stl
@@ -6,7 +6,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "chipdisko.ogg")
+    (music "music/chipdisko.ogg")
     (gravity 10.0)
     (tilemap
       (layer "background")
@@ -93,7 +93,7 @@
       )
     )
     (background
-      (image "arctis.jpg")
+      (image "images/background/arctis.jpg")
       (speed 0.5)
     )
     (leveltime

diff --git a/data/levels/world1/worldmap.stwm b/data/levels/world1/worldmap.stwm
index 8b9e7c4..970d73b 100644 (file)
--- a/data/levels/world1/worldmap.stwm
+++ b/data/levels/world1/worldmap.stwm
@@ -2,7 +2,7 @@
 (supertux-worldmap
   (properties 
     (name (_ "Icyisland"))
-    (music "salcon.ogg")
+    (music "music/salcon.ogg")
   )
   (intro-script "
 display_text_file(\"intro.txt\")

diff --git a/data/levels/world2/castle.stl b/data/levels/world2/castle.stl
index 00fca85..d14ce39 100644 (file)
--- a/data/levels/world2/castle.stl
+++ b/data/levels/world2/castle.stl
@@ -8,7 +8,7 @@
   (start_pos_x    100)
   (start_pos_y    100)
   (background "")
-  (music "chipdisko.ogg")
+  (music "music/music/chipdisko.ogg")
   (bkgd_red_top    60)
   (bkgd_green_top  70)
   (bkgd_blue_top   110)

diff --git a/data/levels/world2/dfk-level2.stl b/data/levels/world2/dfk-level2.stl
index 0400663..4c5337c 100644 (file)
--- a/data/levels/world2/dfk-level2.stl
+++ b/data/levels/world2/dfk-level2.stl
@@ -756,7 +756,7 @@
     )
 
        (background
-         (image "arctis_dark.jpg")
+         (image "images/background/images/background/arctis_dark.jpg")
          (speed 1.000000)
        )
        (spawnpoint (name "main") (x 448) (y 2976))

diff --git a/data/levels/world2/dfk-level3.stl b/data/levels/world2/dfk-level3.stl
index 03fe7e7..3def2df 100644 (file)
--- a/data/levels/world2/dfk-level3.stl
+++ b/data/levels/world2/dfk-level3.stl
@@ -5,7 +5,7 @@
   (author "SuperTux Team")
   (sector
     (name "main")
-    (music "darkforestkeep.ogg")
+    (music "music/darkforestkeep.ogg")
     (gravity 10.000000)
     (tilemap
       (layer  "background")
@@ -1100,7 +1100,7 @@
    )
   (sector
     (name  "outside")
-    (music  "darkforestkeep.ogg")
+    (music  "music/darkforestkeep.ogg")
     (gravity 10.000000)
     (tilemap
       (layer  "background")

diff --git a/data/levels/world2/forest1-grumbel.stl b/data/levels/world2/forest1-grumbel.stl
index d9ba9f1..3584172 100644 (file)
--- a/data/levels/world2/forest1-grumbel.stl
+++ b/data/levels/world2/forest1-grumbel.stl
@@ -8,9 +8,9 @@
     (name  "main")
     (width  100)
     (height  50)
-    (music "forest.ogg")
+    (music "music/music/forest.ogg")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
+    (background (image "images/background/images/background/arctis.jpg")
                 (speed 0.5))
     (tilemap
       (layer  "background")

diff --git a/data/levels/world2/level1.stl b/data/levels/world2/level1.stl
index 4c4d3a8..003ff04 100644 (file)
--- a/data/levels/world2/level1.stl
+++ b/data/levels/world2/level1.stl
@@ -336,7 +336,7 @@
     )
 
        (background
-         (image "forest1.jpg")
+         (image "images/background/forest1.jpg")
          (speed 1.000000)
        )
        (dispenser (x 31) (y 605) (badguy "poisonivy") (cycle 4))
@@ -839,7 +839,7 @@
          (spawnpoint "secret01")
        )
        (background
-         (image "forest1.jpg")
+         (image "images/background/forest1.jpg")
          (speed 1.000000)
        )
        (door

diff --git a/data/levels/world2/level2.stl b/data/levels/world2/level2.stl
index f33f8ea..98e7d10 100644 (file)
--- a/data/levels/world2/level2.stl
+++ b/data/levels/world2/level2.stl
@@ -186,7 +186,7 @@
     )
 
        (background
-         (image "forest1.jpg")
+         (image "images/background/forest1.jpg")
          (speed 1.000000)
        )
        (init-script "level2_init();")
@@ -203,7 +203,7 @@
       (bonusblock (x 672) (y 1056)
         (contents "custom")
         (powerup
-          (sprite "images/powerups/potions/red-potion.sprite")
+          (sprite "potions/red-potion.sprite")
           (script "levelflip();")
         )
       )

diff --git a/data/levels/world2/level4.stl b/data/levels/world2/level4.stl
index d6e4dec..124c522 100644 (file)
--- a/data/levels/world2/level4.stl
+++ b/data/levels/world2/level4.stl
@@ -4,7 +4,7 @@
   (name   (_ "Going Underground"))
   (author "Anubis")
   (extro
-    (music "gameover_forest.ogg")
+    (music "music/music/gameover_forest.ogg")
     (length 12.7)
   )
   (sector
@@ -340,7 +340,7 @@
     )
 
        (background
-         (image "ghostforest.jpg")
+         (image "images/background/ghostforest.jpg")
          (speed 1.000000)
        )
        (particles-rain

diff --git a/data/levels/world2/level5.stl b/data/levels/world2/level5.stl
index b0d7dae..def28d2 100644 (file)
--- a/data/levels/world2/level5.stl
+++ b/data/levels/world2/level5.stl
@@ -186,7 +186,7 @@
     )
 
        (background
-         (image "forest1.jpg")
+         (image "images/background/forest1.jpg")
          (speed 0.100000)
        )
        (spawnpoint (name "main") (x 32) (y 1248))

diff --git a/data/levels/world2/level6.stl b/data/levels/world2/level6.stl
index e04cd2c..4c9f4df 100644 (file)
--- a/data/levels/world2/level6.stl
+++ b/data/levels/world2/level6.stl
@@ -942,7 +942,7 @@
 
        (spawnpoint (name "main") (x 64) (y 9536))
        (background
-         (image "forest1.jpg")
+         (image "images/background/images/background/forest1.jpg")
          (speed 1.000000)
        )
        (poisonivy (x 1349) (y 8844))

diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index 47793cb..f0b69ab 100644 (file)
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -2,7 +2,7 @@
 (supertux-worldmap
   (properties
     (name (_ "Forest World"))
-    (music "forestmap.ogg")
+    (music "music/forestmap.ogg")
     (start_pos_x 0)
     (start_pos_y 0)
   )

diff --git a/src/object/background.cpp b/src/object/background.cpp
index 025adbc..2b7efb4 100644 (file)
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -93,7 +93,7 @@ Background::set_image(const std::string& name, float speed)
   this->speed = speed;
 
   delete image;
-  image = new Surface("images/background/" + name);
+  image = new Surface(name);
 }
 
 void

diff --git a/src/sector.cpp b/src/sector.cpp
index cbdc96f..9c83a76 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -153,7 +153,7 @@ Sector::parse(const lisp::Lisp& sector)
     } else if(token == "gravity") {
       iter.value()->get(gravity);
     } else if(token == "music") {
-      iter.value()->get(song_title);
+      iter.value()->get(music);
     } else if(token == "spawnpoint") {
       SpawnPoint* sp = new SpawnPoint(iter.lisp());
       spawnpoints.push_back(sp);
@@ -214,7 +214,8 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   
   if(backgroundimage != "") {
     Background* background = new Background;
-    background->set_image(backgroundimage, bgspeed);
+    background->set_image(
+            std::string("images/background/") + backgroundimage, bgspeed);
     add_object(background);
   } else {
     Background* background = new Background;
@@ -240,8 +241,9 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   spawn->name = "main";
   spawnpoints.push_back(spawn);
 
-  song_title = "chipdisko.ogg";
-  reader.get("music", song_title);
+  music = "chipdisko.ogg";
+  reader.get("music", music);
+  music = "music/" + music;
 
   int width = 30, height = 15;
   reader.get("width", width);
@@ -349,7 +351,7 @@ Sector::write(lisp::Writer& writer)
 {
   writer.write_string("name", name);
   writer.write_float("gravity", gravity);
-  writer.write_string("music", song_title);
+  writer.write_string("music", music);
 
   // write spawnpoints
   for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end();
@@ -933,7 +935,7 @@ Sector::play_music(MusicType type)
   currentmusic = type;
   switch(currentmusic) {
     case LEVEL_MUSIC:
-      sound_manager->play_music(std::string("music/") + song_title);
+      sound_manager->play_music(music);
       break;
     case HERRING_MUSIC:
       sound_manager->play_music("music/salcon.ogg");

diff --git a/src/sector.hpp b/src/sector.hpp
index 0806cf2..99d8746 100644 (file)
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -120,7 +120,7 @@ private:
   std::string name;
 
 public:
-  std::string song_title;
+  std::string music;
   float gravity;
 
   // some special objects, where we need direct access

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 3d6b6f9..2896d64 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -358,7 +358,7 @@ WorldMap::WorldMap()
   teleporterdot = new Surface("images/worldmap/common/teleporterdot.png");
 
   name = "<no title>";
-  music = "salcon.ogg";
+  music = "music/salcon.ogg";
   intro_displayed = false;
 
   total_stats.reset();
@@ -848,7 +848,7 @@ WorldMap::update(float delta)
               break;
             }
 
-          sound_manager->play_music(std::string("music/") + music);
+          sound_manager->play_music(music);
           Menu::set_current(0);
           if (!savegame_file.empty())
             savegame(savegame_file);
@@ -1001,7 +1001,7 @@ WorldMap::display()
 
   quit = false;
 
-  sound_manager->play_music(std::string("music/") + music);
+  sound_manager->play_music(music);
 
   if(!intro_displayed && intro_script != "") {
     try {