Moved files

Miguel-hrvs · Jan 2, 2021 · 4fc10a3 · 4fc10a3
1 parent ffcc738
commit 4fc10a3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/samples/allegro.ogg → musics/allegro.ogg b/samples/allegro.ogg → musics/allegro.ogg
diff --git a/samples/creativecommons.ogg → musics/creativecommons.ogg b/samples/creativecommons.ogg → musics/creativecommons.ogg
diff --git a/scripts/legacy/cutscenes/allegro.obj b/scripts/legacy/cutscenes/allegro.obj
@@ -12,7 +12,7 @@ object ".allegro_startup"
         create_child .cutscene_skipper[pedantic]
         set_absolute_position screen_width()/2 screen_height()/2
         set_animation SD_ALLEGRO 0
-        play_sample samples/allegro.ogg
+        play_sample musics/allegro.ogg
         change_state wait
     }
 
@@ -23,7 +23,7 @@ object ".allegro_startup"
 
     state stop
     {
-        stop_sample samples/allegro.ogg
+        stop_sample musics/allegro.ogg
         change_state fadeout_fast
     }
 

diff --git a/scripts/legacy/cutscenes/creativecommons.obj b/scripts/legacy/cutscenes/creativecommons.obj
@@ -27,7 +27,7 @@ object ".creativecommons_startup"
 
     state create_logo
     {
-        play_sample samples/creativecommons.ogg
+        play_sample musics/creativecommons.ogg
         create_child .creativecommons_startup.logo
         change_state wait_some_more
     }
@@ -39,7 +39,7 @@ object ".creativecommons_startup"
 
     state fadeout
     {
-        stop_sample samples/creativecommons.ogg
+        stop_sample musics/creativecommons.ogg
         let $_fade_in=0
         let $_fade_duration=0.5
         create_child .fade_effect
@@ -54,7 +54,7 @@ object ".creativecommons_startup"
 
     state fadeout2
     {
-        stop_sample samples/creativecommons.ogg
+        stop_sample musics/creativecommons.ogg
         let $_fade_in=0
         let $_fade_duration=0.5
         create_child .fade_effect

diff --git a/src/misc/credits.c b/src/misc/credits.c
@@ -67,6 +67,8 @@ Johan Brodd (jobromedia) \n\
 --- musics/silence.ogg (public domain) \n\
 --- musics/intro.ogg (public domain) \n\
 --- musics/sharp.ogg (public domain) \n\
+--- musics/allegro.ogg (public domain) \n\
+--- musics/creativecommons.ogg (public domain) \n\
 --- musics/invincible.ogg (public domain - edited by Alexandre)\n\
 --- musics/winning.ogg \n\
 --- musics/winning_plus.ogg \n\
@@ -356,10 +358,6 @@ d1337r \n\
 CGEffex (freesound.org) \n\
 --- samples/roar.ogg \n\
 \n\
-Johan Brodd \n\
---- samples/allegro.ogg (public domain) \n\
---- samples/creativecommons.ogg (public domain) \n\
-\n\
 InspectorJ (www.jshaw.co.uk) of freesound.org \n\
 --- samples/waterlevel.wav \n\
 \n\