From: Matthias Braun Date: Sun, 22 Jan 2006 16:37:16 +0000 (+0000) Subject: music and image paths in levels are now absolute (from datadir) X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e7d8a0f2ce25940b12d25a9116cb7881c71835f4;p=supertux.git 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 b5c4df946..9c04822b7 100644 --- 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 f87290128..63987cf9f 100644 --- 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 e1f5da055..d05d8043f 100644 --- 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 53d03daae..b108c1ac0 100644 --- 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 3321b972d..bbab57a1d 100644 --- 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 910da2489..caecceb97 100644 --- 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 9caeb910d..f3841b323 100644 --- 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 5d6bde112..44fa56d37 100644 --- 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 3dc7f5ecc..87dbb5363 100644 --- 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 7616866c5..45b1f9cc6 100644 --- 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 5d8af1de4..94114da35 100644 --- 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 fe0f9db98..f972bd0a9 100644 --- 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 38684b977..5d1e852a5 100644 --- 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 31233ecbb..7aea9823c 100644 --- 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 fd7942970..62ecc8619 100644 --- 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 b1f944705..826c055dd 100644 --- 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 794a71fd5..1eb2c1193 100644 --- 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 7c71ae9d8..b713a8b0b 100644 --- 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 1f48626c0..12a5807af 100644 --- 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 2a6afd620..8249a4288 100644 --- 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 a6f627014..8a2716270 100644 --- 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 2b31ddd00..2b527a70a 100644 --- 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 67e754487..5bfacf61c 100644 --- 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 533e96960..fb0080675 100644 --- 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 57807a440..32fb97d6d 100644 --- 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 de14973e4..88ab3f9eb 100644 --- a/data/levels/bonus2/level1.stl +++ b/data/levels/bonus2/level1.stl @@ -5,7 +5,7 @@ (author "Kevin") (sector (name "main") - (music "fortress2.ogg") + (music "music/fortress2.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/level10.stl b/data/levels/bonus2/level10.stl index 543269b43..66249196f 100644 --- 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 c2b955613..5589d6e26 100644 --- 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 262b83618..e9649e23a 100644 --- a/data/levels/bonus2/level12.stl +++ b/data/levels/bonus2/level12.stl @@ -5,7 +5,7 @@ (author "Daniel Alston") (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/level13.stl b/data/levels/bonus2/level13.stl index 65f34499b..419cb36f2 100644 --- 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 8559daaf8..c1ae21699 100644 --- 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 3ab82636f..1c7dad48e 100644 --- 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 b3d4d2bc7..e44587c9b 100644 --- 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 7c8e06dff..07f0ca2be 100644 --- 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 ade61941b..da0486ea8 100644 --- 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 555c22e81..e884f3db0 100644 --- 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 f8ef781e7..6831f0fe5 100644 --- a/data/levels/bonus2/level2.stl +++ b/data/levels/bonus2/level2.stl @@ -5,7 +5,7 @@ (author "Kevin") (sector (name "main") - (music "cave.ogg") + (music "music/cave.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/level20.stl b/data/levels/bonus2/level20.stl index f4cd00a92..fad139b44 100644 --- 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 d397bd7b0..91f5ca226 100644 --- 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 a6aaeaa4f..7403d3833 100644 --- 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 6166bcf35..0d0f0d10f 100644 --- 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 e0a3ea793..7bd38eae3 100644 --- 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 26e4d72e8..3b977cad4 100644 --- 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 1a3a1c4d6..c3a2ff984 100644 --- 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 b3f968ab0..6cc1b6df3 100644 --- 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 c27088557..34f0c858d 100644 --- 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 b078fa6af..c8b9ae763 100644 --- 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 57f46ea1f..cea0e8301 100644 --- 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 e27d5e927..f3808701d 100644 --- 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 f184a362b..c528ca360 100644 --- 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 6eac0df26..bb2dfd08f 100644 --- a/data/levels/bonus2/level7.stl +++ b/data/levels/bonus2/level7.stl @@ -5,7 +5,7 @@ (author "Kevin") (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/level8.stl b/data/levels/bonus2/level8.stl index 3a641eb94..56f0048c4 100644 --- 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 a693848ed..6a7413b08 100644 --- 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 f3581956c..6a39c0002 100644 --- 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 eb57c88b5..8b00d12db 100644 --- 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 38a284685..6b01af653 100644 --- 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 f645e3a77..ed712c8b6 100644 --- 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 1ab8d0a7a..2ae1a870f 100644 --- 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 072f81f8b..d101fd6be 100644 --- 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 33dcff606..d2c8dca29 100644 --- 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 ac81ac393..90395b5bf 100644 --- 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 1bd9e5a1c..453e18475 100644 --- 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 2b54d47eb..d1f4fe899 100644 --- 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 3a406ce98..008a4c203 100644 --- 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 84806388c..ae81f97e9 100644 --- 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 27c4eaccf..c2f6f1fb9 100644 --- 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 b408d6e14..9fc8b82be 100644 --- 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 e45ee19c9..ae65b1362 100644 --- 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 149f7e5d5..e800f732f 100644 --- 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 4a4f1f19c..b93450e88 100644 --- 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 523da5d02..65ac89671 100644 --- 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 52dba066c..01695b495 100644 --- 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 d3465140b..3fb8cb2c7 100644 --- 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 c6cabc495..c19971f41 100644 --- 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 cf78c77d5..4b4d11e75 100644 --- 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 b9c136be3..edce5e36d 100644 --- 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 dbf6197c5..9bee19806 100644 --- 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 79b1b84a1..a7b5d4a80 100644 --- 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 875877e72..8a275bf29 100644 --- 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 af8f9317a..477792dd2 100644 --- 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 e53acb5ea..c16c76318 100644 --- 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 b13a33b03..ed03ed110 100644 --- 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 ed9ce49df..1887dd3fc 100644 --- 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 141847e75..7932cf483 100644 --- 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 07427a4fe..3db5b1f27 100644 --- 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 4dce54ff8..4e1dbecf1 100644 --- 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 0c2635e53..ef8f4322f 100644 --- 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 a7c6cba13..72dca8bdb 100644 --- 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 40ad26115..51982055f 100644 --- 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 65857e3fb..64a21aaa0 100644 --- 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 56c5c0adb..252af2c81 100644 --- 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 8b20bb9f7..0ced77aeb 100644 --- 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 041121fa2..b1b7bb626 100644 --- 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 10dfae3a9..1cdf0497a 100644 --- 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 f11965ca8..8c60862d4 100644 --- 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 44592266a..f92f0d7bc 100644 --- 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 115e8f465..a0a98c2d0 100644 --- 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 b55250ee5..a1105281e 100644 --- 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 ff31e5585..eacffdbce 100644 --- 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 9bfe50b8a..3c63e094a 100644 --- 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 0e5facfc0..c4b6be986 100644 --- 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 384888bd2..4555f7256 100644 --- 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 c8988f698..1d7192976 100644 --- 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 d404c2b7a..a8a3d7663 100644 --- 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 05f124132..b07960345 100644 --- 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 9a37b1ae2..1dc8fd92e 100644 --- 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 0141ed37a..eb5ab79ba 100644 --- 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 8e010aa9f..23bd5225c 100644 --- 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 892694da2..3e71d921b 100644 --- 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 cd6df6a4b..ef5e9ac24 100644 --- 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 7918e44bb..f5db25995 100644 --- 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 eded6aef1..a728abb1e 100644 --- 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 f49fca59e..3e25075a3 100644 --- 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 fe9c009c1..a40da5e6e 100644 --- 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 b8f8fa543..83b8bfc9f 100644 --- 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 8b9e7c439..970d73b0f 100644 --- 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 00fca852f..d14ce395f 100644 --- 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 04006630c..4c5337c49 100644 --- 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 03fe7e7bb..3def2df26 100644 --- 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 d9ba9f11d..3584172c0 100644 --- 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 4c4d3a8d3..003ff0455 100644 --- 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 f33f8eaa1..98e7d1015 100644 --- 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 d6e4decdf..124c522f6 100644 --- 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 b0d7dae39..def28d291 100644 --- 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 e04cd2caa..4c9f4dff1 100644 --- 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 47793cbda..f0b69ab41 100644 --- 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 025adbc4c..2b7efb45f 100644 --- 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 cbdc96fba..9c83a7683 100644 --- 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 0806cf209..99d874611 100644 --- 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 3d6b6f96c..2896d6414 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -358,7 +358,7 @@ WorldMap::WorldMap() teleporterdot = new Surface("images/worldmap/common/teleporterdot.png"); name = ""; - 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 {