diff --git a/LICENSES b/LICENSES index 5489aa4..c963f04 100644 --- a/LICENSES +++ b/LICENSES @@ -675,11 +675,12 @@ Changes: Amplified -1 dB and slowed down 5% with Audacity ------------------------------------------------------------------------ -music/death.ogg +music/reremix.ogg -Author: Jan125 -License: CC BY 3.0 -Source: http://opengameart.org/content/stereotypical-90s-space-shooter-music +Author: The Diligent Circle +License: CC BY-SA 4.0 +Details: + Remix of RE.ogg. RE.ogg is composed by WeskerHunter. ------------------------------------------------------------------------ diff --git a/music/death.ogg b/music/death.ogg deleted file mode 100644 index 5485539..0000000 Binary files a/music/death.ogg and /dev/null differ diff --git a/music/reremix.ogg b/music/reremix.ogg new file mode 100644 index 0000000..0662456 Binary files /dev/null and b/music/reremix.ogg differ diff --git a/music/sources/reremix.mmpz b/music/sources/reremix.mmpz new file mode 100644 index 0000000..db4582a Binary files /dev/null and b/music/sources/reremix.mmpz differ diff --git a/src/audio.c b/src/audio.c index 3374f5d..28163c0 100644 --- a/src/audio.c +++ b/src/audio.c @@ -66,7 +66,8 @@ void audio_playSound(int sid, float x, float y) int angle = atanf((x - (screen->w / 2)) / (screen->w / 2)) * 180 / M_PI; int attenuation = fabsf(x - (screen->w / 2)) / (screen->w / 20); float distance = sqrtf(powf(fabsf(x - (screen->w / 2)), 2) + powf(fabsf(y - (screen->h / 2)), 2)); - int volume = MIX_MAX_VOLUME - (MIX_MAX_VOLUME * distance / (3 * screen->w)); + const int max_volume = MIX_MAX_VOLUME / 2; + int volume = max_volume - (max_volume * distance / (3 * screen->w)); if ((!engine.useSound) || (!engine.useAudio) || (volume <= 0)) return; @@ -109,8 +110,8 @@ void audio_playSound(int sid, float x, float y) } else { - if (Mix_Playing(channel) && (volume <= MIX_MAX_VOLUME / 4) - && (channelVolume[channel] >= MIX_MAX_VOLUME * 3 / 4)) + if (Mix_Playing(channel) && (volume <= max_volume / 4) + && (channelVolume[channel] >= max_volume * 3 / 4)) return; else channelVolume[channel] = volume; @@ -169,14 +170,14 @@ void audio_setMusicVolume(int volume) #endif } -void audio_playMusic(const char *filename, int loops) +void audio_playMusic(const char *filename, int loops, int amplified) { #ifndef NOSOUND if (engine.useMusic && engine.useAudio) { audio_haltMusic(); music = Mix_LoadMUS(filename); - audio_setMusicVolume(100); + audio_setMusicVolume(amplified ? MIX_MAX_VOLUME : MIX_MAX_VOLUME / 2); Mix_PlayMusic(music, loops); } #endif @@ -223,7 +224,7 @@ void audio_playRandomTrack() { #ifndef OLD_MUSIC case MISN_START: - audio_playMusic("music/railjet_short.ogg", -1); + audio_playMusic("music/railjet_short.ogg", -1, 0); break; #endif case MISN_MOEBO: @@ -231,20 +232,20 @@ void audio_playRandomTrack() case MISN_ELLESH: case MISN_EARTH: #ifdef OLD_MUSIC - audio_playMusic("music/HardTranceDub.mod", -1); + audio_playMusic("music/HardTranceDub.mod", -1, 0); #else - audio_playMusic("music/orbital_colossus.ogg", -1); + audio_playMusic("music/orbital_colossus.ogg", -1, 0); #endif break; case MISN_VENUS: #ifdef OLD_MUSIC - audio_playMusic("music/LoopsAndTings.mod", -1); + audio_playMusic("music/LoopsAndTings.mod", -1, 0); #else - audio_playMusic("music/RE.ogg", -1); + audio_playMusic("music/RE.ogg", -1, 0); #endif break; default: - audio_playMusic(track[rand() % tracks], -1); + audio_playMusic(track[rand() % tracks], -1, 0); } #endif } diff --git a/src/audio.h b/src/audio.h index 09f6949..a1c2df5 100644 --- a/src/audio.h +++ b/src/audio.h @@ -29,7 +29,7 @@ void audio_haltMusic(); void audio_pauseMusic(); void audio_resumeMusic(); void audio_setMusicVolume(int volume); -void audio_playMusic(const char *filename, int loops); +void audio_playMusic(const char *filename, int loops, int amplified); void audio_playRandomTrack(); void audio_free(); diff --git a/src/game.c b/src/game.c index 8a06dcf..5291c54 100644 --- a/src/game.c +++ b/src/game.c @@ -2449,9 +2449,9 @@ static void game_showGameOver() SDL_Delay(1000); #ifdef OLD_MUSIC - audio_playMusic("music/Wybierak.mod", -1); + audio_playMusic("music/Wybierak.mod", -1, 0); #else - audio_playMusic("music/death.ogg", -1); + audio_playMusic("music/reremix.ogg", -1, 1); #endif int x = (screen->w - gameover->w) / 2; diff --git a/src/intermission.c b/src/intermission.c index 1bf3e90..de0df2d 100644 --- a/src/intermission.c +++ b/src/intermission.c @@ -1319,9 +1319,9 @@ static void intermission_doOptions(SDL_Surface *optionsSurface, int x, int y) { engine.useMusic = 1; #ifdef OLD_MUSIC - audio_playMusic("music/3DParadise.mod", -1); + audio_playMusic("music/3DParadise.mod", -1, 0); #else - audio_playMusic("music/through_space.ogg", -1); + audio_playMusic("music/through_space.ogg", -1, 0); #endif } @@ -1505,9 +1505,9 @@ int intermission() if ((engine.useAudio) && (engine.useMusic)) #ifdef OLD_MUSIC - audio_playMusic("music/3DParadise.mod", -1); + audio_playMusic("music/3DParadise.mod", -1, 0); #else - audio_playMusic("music/through_space.ogg", -1); + audio_playMusic("music/through_space.ogg", -1, 0); #endif /// Retain "%s" as-is. It is replaced with the current system name. diff --git a/src/mission.c b/src/mission.c index d077b96..f4fc73d 100644 --- a/src/mission.c +++ b/src/mission.c @@ -925,9 +925,9 @@ static int mission_revealObjectives() aliens[ALIEN_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE; player_setTarget(ALIEN_KLINE); #ifdef OLD_MUSIC - audio_playMusic("music/TranceGeneration.mod", -1); + audio_playMusic("music/TranceGeneration.mod", -1, 0); #else - audio_playMusic("music/last_cyber_dance.ogg", -1); + audio_playMusic("music/last_cyber_dance.ogg", -1, 0); #endif } } diff --git a/src/title.c b/src/title.c index 91a6a68..877ff4a 100644 --- a/src/title.c +++ b/src/title.c @@ -314,9 +314,9 @@ int title_show() engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0; #ifdef OLD_MUSIC - audio_playMusic("music/Platinum.mod", 1); + audio_playMusic("music/Platinum.mod", 1, 0); #else - audio_playMusic("music/walking_among_androids.ogg", 1); + audio_playMusic("music/walking_among_androids.ogg", 1, 0); #endif while (!engine.done) @@ -515,9 +515,9 @@ int title_show() if (engine.useMusic) { #ifdef OLD_MUSIC - audio_playMusic("music/Platinum.mod", 1); + audio_playMusic("music/Platinum.mod", 1, 0); #else - audio_playMusic("music/walking_among_androids.ogg", 1); + audio_playMusic("music/walking_among_androids.ogg", 1, 0); #endif } else @@ -652,9 +652,9 @@ void title_showCredits() screen_drawBackground(); #ifdef OLD_MUSIC - audio_playMusic("music/Solace.s3m", 1); + audio_playMusic("music/Solace.s3m", 1, 0); #else - audio_playMusic("music/rise_of_spirit.ogg", 1); + audio_playMusic("music/rise_of_spirit.ogg", 1, 0); #endif fp = fopen("data/credits.txt", "rb");