diff --git a/LICENSES b/LICENSES index c939b68..22a7b2b 100644 --- a/LICENSES +++ b/LICENSES @@ -599,6 +599,7 @@ Details: Tuned down 5 half-notes. ------------------------------------------------------------------------ music/android_oppression.ogg +music/sleeping_with_androids.ogg Author: The Diligent Circle License: CC0 @@ -675,15 +676,6 @@ Source: http://opengameart.org/content/last-cyber-dance ------------------------------------------------------------------------ -music/RE.ogg - -Author: WeskerHunter -License: CC BY-SA 3.0 -Source: http://opengameart.org/content/fast-high-music -Changes: Amplified -1 dB and slowed down 5% with Audacity - ------------------------------------------------------------------------- - music/first_cyber_dance.ogg Authors: @@ -695,15 +687,6 @@ Details: ------------------------------------------------------------------------ -music/reremix.ogg - -Author: The Diligent Circle -License: CC BY-SA 4.0 -Details: - Remix of RE.ogg. RE.ogg is composed by WeskerHunter. - ------------------------------------------------------------------------- - music/rise_of_spirit.ogg Author: Alexandr Zhelanov diff --git a/data/credits.txt b/data/credits.txt index 8fde31e..c16f025 100644 --- a/data/credits.txt +++ b/data/credits.txt @@ -51,7 +51,6 @@ 020 tgfcoder 020 JunglistMilitia 020 neocrey -020 WeskerHunter 020 The Diligent Circle 020 Sweetpea 020 Alexandr Zhelanov diff --git a/music/Makefile.am b/music/Makefile.am index 74aeb46..8bf7ec7 100644 --- a/music/Makefile.am +++ b/music/Makefile.am @@ -13,9 +13,8 @@ nobase_dist_music_DATA = \ last_cyber_dance.ogg \ orbital_colossus.ogg \ railjet_short.ogg \ - RE.ogg \ - reremix.ogg \ rise_of_spirit.ogg \ + sleeping_with_androids.ogg \ sound_and_silence.ogg \ space_dimensions.ogg \ through_space.ogg diff --git a/music/RE.ogg b/music/RE.ogg deleted file mode 100644 index 12513fb..0000000 Binary files a/music/RE.ogg and /dev/null differ diff --git a/music/reremix.ogg b/music/reremix.ogg deleted file mode 100644 index 0662456..0000000 Binary files a/music/reremix.ogg and /dev/null differ diff --git a/music/sleeping_with_androids.ogg b/music/sleeping_with_androids.ogg new file mode 100644 index 0000000..8ce9cfb Binary files /dev/null and b/music/sleeping_with_androids.ogg differ diff --git a/music/sources/reremix.mmpz b/music/sources/reremix.mmpz deleted file mode 100644 index db4582a..0000000 Binary files a/music/sources/reremix.mmpz and /dev/null differ diff --git a/music/sources/sleeping_with_androids.mmpz b/music/sources/sleeping_with_androids.mmpz new file mode 100644 index 0000000..f28dc1c Binary files /dev/null and b/music/sources/sleeping_with_androids.mmpz differ diff --git a/src/game.c b/src/game.c index 00125f4..604852c 100644 --- a/src/game.c +++ b/src/game.c @@ -2455,7 +2455,7 @@ static void game_showGameOver() #ifdef OLD_MUSIC audio_playMusic("music/Wybierak.mod", -1); #else - audio_playMusic("music/reremix.ogg", -1); + audio_playMusic("music/sleeping_with_androids.ogg", 0); #endif int x = (screen->w - gameover->w) / 2;