From: Marek Moeckel Date: Fri, 24 Jun 2005 08:21:59 +0000 (+0000) Subject: converted all music files to Ogg Vorbis X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=652a03bec46796231fba1733beeec1095e4cf26d;p=supertux.git converted all music files to Ogg Vorbis SVN-Revision: 2640 --- diff --git a/data/Jamfile b/data/Jamfile index c61c3188a..eb48fdc90 100644 --- a/data/Jamfile +++ b/data/Jamfile @@ -93,6 +93,6 @@ for p in $(LEVELPATHS) { XGETTEXT_FLAGS on $(SUBDIR)/$(p)/messages.pot += --language=Lisp ; } InstallData [ Wildcard *.txt ] ; -InstallData [ Wildcard music : *.mod *.ogg ] : music ; +InstallData [ Wildcard music : *.ogg ] : music ; InstallData [ Wildcard sounds : *.wav ] : sounds ; InstallData [ Wildcard locale : *.po ] : locale ; diff --git a/data/levels/bonus1/abednego-level1.stl b/data/levels/bonus1/abednego-level1.stl index 2a8b273b1..40542f3c0 100644 --- a/data/levels/bonus1/abednego-level1.stl +++ b/data/levels/bonus1/abednego-level1.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/abednego-level2.stl b/data/levels/bonus1/abednego-level2.stl index 970559010..783d8c11b 100644 --- a/data/levels/bonus1/abednego-level2.stl +++ b/data/levels/bonus1/abednego-level2.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/abednego-level3.stl b/data/levels/bonus1/abednego-level3.stl index 2759616fd..f2527f93f 100644 --- a/data/levels/bonus1/abednego-level3.stl +++ b/data/levels/bonus1/abednego-level3.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/abednego-level4.stl b/data/levels/bonus1/abednego-level4.stl index ae41af7cc..e68f39648 100644 --- a/data/levels/bonus1/abednego-level4.stl +++ b/data/levels/bonus1/abednego-level4.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "ocean.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/bonus-level1.stl b/data/levels/bonus1/bonus-level1.stl index 4b1a83122..e807f7ed2 100644 --- a/data/levels/bonus1/bonus-level1.stl +++ b/data/levels/bonus1/bonus-level1.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/bonus-level2.stl b/data/levels/bonus1/bonus-level2.stl index eba3d9c5b..cd7f0ada9 100644 --- a/data/levels/bonus1/bonus-level2.stl +++ b/data/levels/bonus1/bonus-level2.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/bonus-level3.stl b/data/levels/bonus1/bonus-level3.stl index e2d5b93a6..eb04e611c 100644 --- a/data/levels/bonus1/bonus-level3.stl +++ b/data/levels/bonus1/bonus-level3.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/bonus-level4.stl b/data/levels/bonus1/bonus-level4.stl index 9117a5a2b..d7a6abc96 100644 --- a/data/levels/bonus1/bonus-level4.stl +++ b/data/levels/bonus1/bonus-level4.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "") - (music "fortress2.mod") + (music "fortress2.ogg") (bkgd_red_top 50) (bkgd_green_top 50) (bkgd_blue_top 50) diff --git a/data/levels/bonus1/bonus-level5.stl b/data/levels/bonus1/bonus-level5.stl index fa72e53d4..cbbb102a9 100644 --- a/data/levels/bonus1/bonus-level5.stl +++ b/data/levels/bonus1/bonus-level5.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/matr1x-level1.stl b/data/levels/bonus1/matr1x-level1.stl index 894826c37..9f15ddb35 100644 --- a/data/levels/bonus1/matr1x-level1.stl +++ b/data/levels/bonus1/matr1x-level1.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/matr1x-level2.stl b/data/levels/bonus1/matr1x-level2.stl index ef05a37bf..fe3edc5a0 100644 --- a/data/levels/bonus1/matr1x-level2.stl +++ b/data/levels/bonus1/matr1x-level2.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 255) (bkgd_green_top 255) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/matr1x-level3.stl b/data/levels/bonus1/matr1x-level3.stl index 66baa8513..dfe68f6b7 100644 --- a/data/levels/bonus1/matr1x-level3.stl +++ b/data/levels/bonus1/matr1x-level3.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "fortress.mod") + (music "fortress.ogg") (bkgd_red_top 88) (bkgd_green_top 88) (bkgd_blue_top 100) diff --git a/data/levels/bonus1/thompson-level1.stl b/data/levels/bonus1/thompson-level1.stl index 36a17a4df..99be92331 100644 --- a/data/levels/bonus1/thompson-level1.stl +++ b/data/levels/bonus1/thompson-level1.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/thompson-level2.stl b/data/levels/bonus1/thompson-level2.stl index c7d577ba3..77b9fe6c1 100644 --- a/data/levels/bonus1/thompson-level2.stl +++ b/data/levels/bonus1/thompson-level2.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/torfi-level1.stl b/data/levels/bonus1/torfi-level1.stl index 385113282..3ace78470 100644 --- a/data/levels/bonus1/torfi-level1.stl +++ b/data/levels/bonus1/torfi-level1.stl @@ -3,7 +3,7 @@ (version 1) (name (_ "A good start")) (author "Torfi Gunnarsson") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (background "arctis.jpg") (particle_system "") (bkgd_speed 50) diff --git a/data/levels/bonus1/torfi-level2.stl b/data/levels/bonus1/torfi-level2.stl index 0d73ce152..454559c4f 100644 --- a/data/levels/bonus1/torfi-level2.stl +++ b/data/levels/bonus1/torfi-level2.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/torfi-level3.stl b/data/levels/bonus1/torfi-level3.stl index ceb518f07..bb35075c5 100644 --- a/data/levels/bonus1/torfi-level3.stl +++ b/data/levels/bonus1/torfi-level3.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/bonus1/wansti-level1.stl b/data/levels/bonus1/wansti-level1.stl index 5ab31ecb0..eb8a8ac9b 100644 --- a/data/levels/bonus1/wansti-level1.stl +++ b/data/levels/bonus1/wansti-level1.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/wansti-level2.stl b/data/levels/bonus1/wansti-level2.stl index ec6010fcb..d90dca6ff 100644 --- a/data/levels/bonus1/wansti-level2.stl +++ b/data/levels/bonus1/wansti-level2.stl @@ -8,7 +8,7 @@ (start_pos_x 170) (start_pos_y 20) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/wansti-level3.stl b/data/levels/bonus1/wansti-level3.stl index 764fe471a..3694e0a06 100644 --- a/data/levels/bonus1/wansti-level3.stl +++ b/data/levels/bonus1/wansti-level3.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/wansti-level4.stl b/data/levels/bonus1/wansti-level4.stl index dd23198b6..d0af408c4 100644 --- a/data/levels/bonus1/wansti-level4.stl +++ b/data/levels/bonus1/wansti-level4.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 200) (bkgd_blue_top 255) diff --git a/data/levels/bonus1/wansti-level5.stl b/data/levels/bonus1/wansti-level5.stl index 46d14bb59..5e6828d87 100644 --- a/data/levels/bonus1/wansti-level5.stl +++ b/data/levels/bonus1/wansti-level5.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 60) (bkgd_green_top 70) (bkgd_blue_top 110) diff --git a/data/levels/bonus1/worldmap.stwm b/data/levels/bonus1/worldmap.stwm index 391642a46..533e96960 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.mod") + (music "salcon.ogg") ) (spawnpoint (name "main") diff --git a/data/levels/contribs/level1.stl b/data/levels/contribs/level1.stl index 2b791034b..42ccab7cf 100644 --- a/data/levels/contribs/level1.stl +++ b/data/levels/contribs/level1.stl @@ -3,7 +3,7 @@ (version 1) (name (_ "The long cave")) (author "Torfi Gunnarsson") - (music "cave.mod") + (music "cave.ogg") (background "cave2.jpg") (particle_system "") (bkgd_speed 50) diff --git a/data/levels/contribs/level3.stl b/data/levels/contribs/level3.stl index 4a88ea9ff..5de7637fc 100644 --- a/data/levels/contribs/level3.stl +++ b/data/levels/contribs/level3.stl @@ -3,7 +3,7 @@ (version 1) (name (_ "Een weg door de wolken")) (author "Tobe Deprez") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (background "") (particle_system "clouds") (bkgd_speed 50) diff --git a/data/levels/test/easteregg.stl b/data/levels/test/easteregg.stl index b97135474..ac81ac393 100644 --- a/data/levels/test/easteregg.stl +++ b/data/levels/test/easteregg.stl @@ -8,7 +8,7 @@ (name "main") (width 60) (height 30) - (music "forest2.mod") + (music "forest2.ogg") (gravity 10.000000) (background (image "forest1.jpg") (speed 0.5)) diff --git a/data/levels/test/endseq.stl b/data/levels/test/endseq.stl index 3a2f5bac2..1bd9e5a1c 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 "Mortimers_chipdisko.mod") + (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 2e08f9049..eecf9788f 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 "Mortimers_chipdisko.mod") + (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 63812740f..3a406ce98 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 "Mortimers_chipdisko.mod") + (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 10bc1aec0..84806388c 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 "Mortimers_chipdisko.mod") + (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 085fa5189..27c4eaccf 100644 --- a/data/levels/test/forest1-grumbel.stl +++ b/data/levels/test/forest1-grumbel.stl @@ -8,7 +8,7 @@ (name "main") (width 100) (height 50) - (music "forest.mod") + (music "forest.ogg") (gravity 10.000000) (background (image "forest1.jpg") (speed 0.5)) diff --git a/data/levels/test/foresttheme.stl b/data/levels/test/foresttheme.stl index 632013457..e45ee19c9 100644 --- a/data/levels/test/foresttheme.stl +++ b/data/levels/test/foresttheme.stl @@ -7,7 +7,7 @@ (sector (name "main") (gravity 10) - (music "forest2.mod") + (music "forest2.ogg") (spawnpoint (name "main") (x 100) diff --git a/data/levels/test/glitches.stl b/data/levels/test/glitches.stl index d83968dd6..149f7e5d5 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.mod") + (music "cave.ogg") (background "cave2.jpg") (particle_system "") (bkgd_speed 50) diff --git a/data/levels/test/mrtree.stl b/data/levels/test/mrtree.stl index 3c37f5f85..cf78c77d5 100644 --- a/data/levels/test/mrtree.stl +++ b/data/levels/test/mrtree.stl @@ -8,7 +8,7 @@ (name "main") (width 100) (height 50) - (music "forest.mod") + (music "forest.ogg") (gravity 10.000000) (background (image "forest1.jpg") (speed 0.5)) diff --git a/data/levels/test/noloktest.stl b/data/levels/test/noloktest.stl index 00e1cce64..b9c136be3 100644 --- a/data/levels/test/noloktest.stl +++ b/data/levels/test/noloktest.stl @@ -9,7 +9,7 @@ (gravity 10) (background (image "arctis_dark.jpg") (speed 0.5)) - (music "bossattack.mod") + (music "bossattack.ogg") (spawnpoint (name "main") (x 100) (y 100)) (nolok_01 (x 650) (y 512)) (tilemap @@ -44,7 +44,7 @@ (sector (name "sector1") (gravity 10) - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (background (image "forest1.jpg") (speed 0.5)) (spawnpoint (name "main2") (x 100) (y 100)) diff --git a/data/levels/test/script.stl b/data/levels/test/script.stl index 2f9bd8414..85b490be5 100644 --- a/data/levels/test/script.stl +++ b/data/levels/test/script.stl @@ -5,7 +5,7 @@ (author "Development Team") (sector (name "main") - (music "salcon.mod") + (music "salcon.ogg") (gravity 10.000000) (tilemap (layer "background") diff --git a/data/levels/test/slopes.stl b/data/levels/test/slopes.stl index 9e0d41f85..b13a33b03 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 "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (background "") (particle_system "") (bkgd_speed 50) diff --git a/data/levels/test/spikes.stl b/data/levels/test/spikes.stl index 29765bad4..ed9ce49df 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 "Mortimers_chipdisko.mod") + (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 0516ad67d..141847e75 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.mod") + (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 b7f453bef..07427a4fe 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.mod") + (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 6bf9b2711..1746aef4d 100644 --- a/data/levels/test/wansti-level4.stl +++ b/data/levels/test/wansti-level4.stl @@ -5,7 +5,7 @@ (author "SuperTux Team") (sector (name "main") - (music "cave.mod") + (music "cave.ogg") (gravity 10.000000) (tilemap (layer "background") diff --git a/data/levels/test/yeti.stl b/data/levels/test/yeti.stl index 017c472cd..8b9eca319 100644 --- a/data/levels/test/yeti.stl +++ b/data/levels/test/yeti.stl @@ -5,7 +5,7 @@ (author "Team") (sector (name "main") - (music "bossattack.mod") + (music "bossattack.ogg") (gravity 10.000000) (tilemap (layer "background") diff --git a/data/levels/world1/level1.stl b/data/levels/world1/level1.stl index fafc4dc2c..a1c4004f3 100644 --- a/data/levels/world1/level1.stl +++ b/data/levels/world1/level1.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level10.stl b/data/levels/world1/level10.stl index 89b0cd2d4..a504e5dd3 100644 --- a/data/levels/world1/level10.stl +++ b/data/levels/world1/level10.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level11.stl b/data/levels/world1/level11.stl index f45f92bf6..ed74b9864 100644 --- a/data/levels/world1/level11.stl +++ b/data/levels/world1/level11.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/world1/level12.stl b/data/levels/world1/level12.stl index b57c5bb28..054f8ead6 100644 --- a/data/levels/world1/level12.stl +++ b/data/levels/world1/level12.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/world1/level13.stl b/data/levels/world1/level13.stl index 4f1d3a80a..a9b7c3f7a 100644 --- a/data/levels/world1/level13.stl +++ b/data/levels/world1/level13.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 100) (bkgd_green_top 150) (bkgd_blue_top 255) diff --git a/data/levels/world1/level14.stl b/data/levels/world1/level14.stl index 7da7d1f57..7634d1f1d 100644 --- a/data/levels/world1/level14.stl +++ b/data/levels/world1/level14.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level15.stl b/data/levels/world1/level15.stl index ecab7d566..54df33a1f 100644 --- a/data/levels/world1/level15.stl +++ b/data/levels/world1/level15.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level16.stl b/data/levels/world1/level16.stl index cfe82bc86..d6dbd5208 100644 --- a/data/levels/world1/level16.stl +++ b/data/levels/world1/level16.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level17.stl b/data/levels/world1/level17.stl index 0c5be8ac5..20410cfa0 100644 --- a/data/levels/world1/level17.stl +++ b/data/levels/world1/level17.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level18.stl b/data/levels/world1/level18.stl index 31d8b0b89..63e882434 100644 --- a/data/levels/world1/level18.stl +++ b/data/levels/world1/level18.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level19.stl b/data/levels/world1/level19.stl index eba5cd101..93a3c0efa 100644 --- a/data/levels/world1/level19.stl +++ b/data/levels/world1/level19.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level2.stl b/data/levels/world1/level2.stl index 2575f36c3..8c6e4d40e 100644 --- a/data/levels/world1/level2.stl +++ b/data/levels/world1/level2.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 100) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level20.stl b/data/levels/world1/level20.stl index 8de394a35..d800ae121 100644 --- a/data/levels/world1/level20.stl +++ b/data/levels/world1/level20.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "cave2.jpg") - (music "cave.mod") + (music "cave.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level21.stl b/data/levels/world1/level21.stl index d5a0dbe7b..fde078d52 100644 --- a/data/levels/world1/level21.stl +++ b/data/levels/world1/level21.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level22.stl b/data/levels/world1/level22.stl index 802ee22c2..1de478d7d 100644 --- a/data/levels/world1/level22.stl +++ b/data/levels/world1/level22.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "fortress.mod") + (music "fortress.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level23.stl b/data/levels/world1/level23.stl index 533cc2aef..ab3f68f9c 100644 --- a/data/levels/world1/level23.stl +++ b/data/levels/world1/level23.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level24.stl b/data/levels/world1/level24.stl index a59f63911..4ed99c2b8 100644 --- a/data/levels/world1/level24.stl +++ b/data/levels/world1/level24.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "ocean.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level25.stl b/data/levels/world1/level25.stl index ccfd0a020..d6bff8f44 100644 --- a/data/levels/world1/level25.stl +++ b/data/levels/world1/level25.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "ocean.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level26.stl b/data/levels/world1/level26.stl index 52af070a1..f8c6fb13e 100644 --- a/data/levels/world1/level26.stl +++ b/data/levels/world1/level26.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "") - (music "fortress.mod") + (music "fortress.ogg") (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) diff --git a/data/levels/world1/level3.stl b/data/levels/world1/level3.stl index 0fca345bc..22e3eeee6 100644 --- a/data/levels/world1/level3.stl +++ b/data/levels/world1/level3.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level4.stl b/data/levels/world1/level4.stl index 91b118a8c..8929a1240 100644 --- a/data/levels/world1/level4.stl +++ b/data/levels/world1/level4.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level5.stl b/data/levels/world1/level5.stl index 3b4451afd..1e2b73293 100644 --- a/data/levels/world1/level5.stl +++ b/data/levels/world1/level5.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level6.stl b/data/levels/world1/level6.stl index 8cc774126..bd2b3a7db 100644 --- a/data/levels/world1/level6.stl +++ b/data/levels/world1/level6.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level7.stl b/data/levels/world1/level7.stl index db6b6f651..80e450867 100644 --- a/data/levels/world1/level7.stl +++ b/data/levels/world1/level7.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level8.stl b/data/levels/world1/level8.stl index e06e03dc2..6b15a1827 100644 --- a/data/levels/world1/level8.stl +++ b/data/levels/world1/level8.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/level9.stl b/data/levels/world1/level9.stl index 84ec75716..11c9107c8 100644 --- a/data/levels/world1/level9.stl +++ b/data/levels/world1/level9.stl @@ -8,7 +8,7 @@ (start_pos_x 100) (start_pos_y 170) (background "arctis.jpg") - (music "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 150) (bkgd_green_top 150) (bkgd_blue_top 150) diff --git a/data/levels/world1/worldmap.stwm b/data/levels/world1/worldmap.stwm index 64750865e..8b9e7c439 100644 --- a/data/levels/world1/worldmap.stwm +++ b/data/levels/world1/worldmap.stwm @@ -2,7 +2,7 @@ (supertux-worldmap (properties (name (_ "Icyisland")) - (music "salcon.mod") + (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 8b16b99fe..00fca852f 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 "Mortimers_chipdisko.mod") + (music "chipdisko.ogg") (bkgd_red_top 60) (bkgd_green_top 70) (bkgd_blue_top 110) diff --git a/data/levels/world2/forest1-grumbel.stl b/data/levels/world2/forest1-grumbel.stl index f54ca43e1..d9ba9f11d 100644 --- a/data/levels/world2/forest1-grumbel.stl +++ b/data/levels/world2/forest1-grumbel.stl @@ -8,7 +8,7 @@ (name "main") (width 100) (height 50) - (music "forest.mod") + (music "forest.ogg") (gravity 10.000000) (background (image "arctis.jpg") (speed 0.5)) diff --git a/data/levels/world2/level1.stl b/data/levels/world2/level1.stl index 8b3388853..cbaa8c207 100644 --- a/data/levels/world2/level1.stl +++ b/data/levels/world2/level1.stl @@ -5,7 +5,7 @@ (author "SuperTux Team") (sector (name "main") - (music "forest2.mod") + (music "forest2.ogg") (gravity 10.000000) (tilemap (layer "background") @@ -484,7 +484,7 @@ ) (sector (name "bonuscaves") - (music "bonuscave.mod") + (music "bonuscave.ogg") (gravity 10.000000) (tilemap (layer "background") diff --git a/data/levels/world2/level2.stl b/data/levels/world2/level2.stl index e1487ee3b..c8c755a75 100644 --- a/data/levels/world2/level2.stl +++ b/data/levels/world2/level2.stl @@ -5,7 +5,7 @@ (author "SuperTux Team") (sector (name "main") - (music "forest.mod") + (music "forest.ogg") (gravity 10.000000) (tilemap (layer "background") diff --git a/data/music/Mortimers_chipdisko.mod b/data/music/Mortimers_chipdisko.mod deleted file mode 100644 index 09715b36c..000000000 Binary files a/data/music/Mortimers_chipdisko.mod and /dev/null differ diff --git a/data/music/bonuscave.mod b/data/music/bonuscave.mod deleted file mode 100644 index 22c1450bd..000000000 Binary files a/data/music/bonuscave.mod and /dev/null differ diff --git a/data/music/bonuscave.ogg b/data/music/bonuscave.ogg new file mode 100644 index 000000000..f8187857e Binary files /dev/null and b/data/music/bonuscave.ogg differ diff --git a/data/music/bossattack.mod b/data/music/bossattack.mod deleted file mode 100644 index 1381971da..000000000 Binary files a/data/music/bossattack.mod and /dev/null differ diff --git a/data/music/bossattack.ogg b/data/music/bossattack.ogg new file mode 100644 index 000000000..0a13f19b5 Binary files /dev/null and b/data/music/bossattack.ogg differ diff --git a/data/music/cave.mod b/data/music/cave.mod deleted file mode 100644 index 12bf124f9..000000000 Binary files a/data/music/cave.mod and /dev/null differ diff --git a/data/music/cave.ogg b/data/music/cave.ogg new file mode 100644 index 000000000..e2292e2f4 Binary files /dev/null and b/data/music/cave.ogg differ diff --git a/data/music/chipdisko.ogg b/data/music/chipdisko.ogg new file mode 100644 index 000000000..754a2191e Binary files /dev/null and b/data/music/chipdisko.ogg differ diff --git a/data/music/credits.ogg b/data/music/credits.ogg index 278fac05d..f3e8e0be0 100644 Binary files a/data/music/credits.ogg and b/data/music/credits.ogg differ diff --git a/data/music/darkforestkeep.ogg b/data/music/darkforestkeep.ogg index a60828978..2b4b9627f 100644 Binary files a/data/music/darkforestkeep.ogg and b/data/music/darkforestkeep.ogg differ diff --git a/data/music/forest.mod b/data/music/forest.mod deleted file mode 100644 index 71c4f258e..000000000 Binary files a/data/music/forest.mod and /dev/null differ diff --git a/data/music/forest.ogg b/data/music/forest.ogg new file mode 100644 index 000000000..19e4c1e34 Binary files /dev/null and b/data/music/forest.ogg differ diff --git a/data/music/forest2-remix.ogg b/data/music/forest2-remix.ogg new file mode 100644 index 000000000..7d174fbcb Binary files /dev/null and b/data/music/forest2-remix.ogg differ diff --git a/data/music/forest2.mod b/data/music/forest2.mod deleted file mode 100644 index d508d7c2f..000000000 Binary files a/data/music/forest2.mod and /dev/null differ diff --git a/data/music/forest2.ogg b/data/music/forest2.ogg new file mode 100644 index 000000000..f97cf6e68 Binary files /dev/null and b/data/music/forest2.ogg differ diff --git a/data/music/fortress.mod b/data/music/fortress.mod deleted file mode 100644 index e782d68a5..000000000 Binary files a/data/music/fortress.mod and /dev/null differ diff --git a/data/music/fortress.ogg b/data/music/fortress.ogg new file mode 100644 index 000000000..658c3dcd4 Binary files /dev/null and b/data/music/fortress.ogg differ diff --git a/data/music/fortress2.mod b/data/music/fortress2.mod deleted file mode 100644 index 554a3d459..000000000 Binary files a/data/music/fortress2.mod and /dev/null differ diff --git a/data/music/fortress2.ogg b/data/music/fortress2.ogg new file mode 100644 index 000000000..1c2bdf787 Binary files /dev/null and b/data/music/fortress2.ogg differ diff --git a/data/music/ghostforest2.ogg b/data/music/ghostforest2.ogg index f23e60a00..336ccb221 100644 Binary files a/data/music/ghostforest2.ogg and b/data/music/ghostforest2.ogg differ diff --git a/data/music/leveldone.mod b/data/music/leveldone.mod deleted file mode 100644 index 0a65f4eac..000000000 Binary files a/data/music/leveldone.mod and /dev/null differ diff --git a/data/music/leveldone.ogg b/data/music/leveldone.ogg new file mode 100644 index 000000000..1836db4c0 Binary files /dev/null and b/data/music/leveldone.ogg differ diff --git a/data/music/salcon.mod b/data/music/salcon.mod deleted file mode 100644 index 962295482..000000000 Binary files a/data/music/salcon.mod and /dev/null differ diff --git a/data/music/salcon.ogg b/data/music/salcon.ogg new file mode 100644 index 000000000..3607d1fb6 Binary files /dev/null and b/data/music/salcon.ogg differ diff --git a/data/music/theme.ogg b/data/music/theme.ogg index 7386856af..3141dbe64 100644 Binary files a/data/music/theme.ogg and b/data/music/theme.ogg differ diff --git a/src/game_session.cpp b/src/game_session.cpp index 59827039f..d8e2204b4 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -698,7 +698,7 @@ GameSession::start_sequence(const std::string& sequencename) end_sequence = ENDSEQUENCE_RUNNING; endsequence_timer.start(7.0); // 7 seconds until we finish the map last_x_pos = -1; - sound_manager->play_music("music/leveldone.mod"); + sound_manager->play_music("music/leveldone.ogg"); currentsector->player->invincible_timer.start(7.0); if(sequencename == "fireworks") { diff --git a/src/sector.cpp b/src/sector.cpp index 6f2f3f246..8ab9caa19 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -72,7 +72,7 @@ Sector::Sector() : gravity(10), player(0), solids(0), camera(0), currentmusic(LEVEL_MUSIC) { - song_title = "Mortimers_chipdisko.mod"; + song_title = "chipdisko.ogg"; player = new Player(&player_status); add_object(player); @@ -241,7 +241,7 @@ Sector::parse_old_format(const lisp::Lisp& reader) spawn->name = "main"; spawnpoints.push_back(spawn); - song_title = "Mortimers_chipdisko.mod"; + song_title = "chipdisko.ogg"; reader.get("music", song_title); int width, height = 15; @@ -796,7 +796,7 @@ Sector::play_music(MusicType type) sound_manager->play_music(std::string("music/") + song_title); break; case HERRING_MUSIC: - sound_manager->play_music("music/salcon.mod"); + sound_manager->play_music("music/salcon.ogg"); break; default: sound_manager->play_music(""); diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 2b4e84754..90589027b 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -358,7 +358,7 @@ WorldMap::WorldMap() teleporterdot = new Surface("images/tiles/worldmap/teleporterdot.png", true); name = ""; - music = "salcon.mod"; + music = "salcon.ogg"; intro_displayed = false; total_stats.reset();