From 82ffaebbc5e4b7d72421b4b5db6d0c37b8a6b0fe Mon Sep 17 00:00:00 2001 From: Layla Marchant Date: Sat, 3 Apr 2021 12:13:44 -0400 Subject: [PATCH] Added use of special music when Kline or the cloak fighter shows up. --- music/sources/last_cyber_dance.mmpz | Bin 0 -> 26167 bytes src/audio.c | 19 ++++++++++++++++++- src/audio.h | 1 + src/game.c | 11 +++++++++-- src/mission.c | 4 +++- 5 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 music/sources/last_cyber_dance.mmpz diff --git a/music/sources/last_cyber_dance.mmpz b/music/sources/last_cyber_dance.mmpz new file mode 100644 index 0000000000000000000000000000000000000000..4dce650688fddd346327a86e2de00e3d2e0562f4 GIT binary patch literal 26167 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. #include "defs.h" #include "structs.h" +#include "alien.h" #include "game.h" #include "engine.h" #include "screen.h" @@ -170,6 +171,14 @@ void audio_setMusicVolume(int volume) #endif } +void audio_setMusicPosition(double position) +{ +#ifndef NOSOUND + if (engine.useMusic && engine.useAudio) + Mix_SetMusicPosition(position); +#endif +} + void audio_playMusic(const char *filename, int loops, int amplified) { #ifndef NOSOUND @@ -225,7 +234,15 @@ void audio_playRandomTrack() #ifndef OLD_MUSIC case MISN_START: case MISN_INTERCEPTION: - audio_playMusic("music/railjet_short.ogg", -1, 0); + if ((aliens[ALIEN_KLINE].classDef == CD_KLINE) + && aliens[ALIEN_KLINE].active) + audio_playMusic("music/last_cyber_dance.ogg", -1, 0); + else if ((game.system == SYSTEM_MORDOR) + && (aliens[ALIEN_BOSS].classDef == CD_CLOAKFIGHTER) + && aliens[ALIEN_BOSS].active) + audio_playMusic("music/space_dimensions.ogg", -1, 0); + else + audio_playMusic("music/railjet_short.ogg", -1, 0); break; case MISN_HAIL: case MISN_JOLDAR: diff --git a/src/audio.h b/src/audio.h index a1c2df5..84c227a 100644 --- a/src/audio.h +++ b/src/audio.h @@ -29,6 +29,7 @@ void audio_haltMusic(); void audio_pauseMusic(); void audio_resumeMusic(); void audio_setMusicVolume(int volume); +void audio_setMusicPosition(double position); 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 5291c54..ae26b04 100644 --- a/src/game.c +++ b/src/game.c @@ -2577,7 +2577,7 @@ int game_mainLoop() // Some specifics for interception missions if (game.area == MISN_INTERCEPTION) { - if ((game.system > SYSTEM_EYANANTH) && ((rand() % 5) == 0)) + if ((game.system > SYSTEM_EYANANTH) && CHANCE(1. / 5.)) { aliens[ALIEN_KLINE] = alien_defs[CD_KLINE]; aliens[ALIEN_KLINE].owner = &aliens[ALIEN_KLINE]; @@ -2590,7 +2590,7 @@ int game_mainLoop() if ((game.system == SYSTEM_MORDOR) && (game.experimentalShield > 0)) { - if ((rand() % 5) > 0) + if (CHANCE(4. / 5.)) { aliens[ALIEN_BOSS] = alien_defs[CD_CLOAKFIGHTER]; aliens[ALIEN_BOSS].owner = &aliens[ALIEN_BOSS]; @@ -2603,6 +2603,13 @@ int game_mainLoop() aliens[ALIEN_BOSS].shield = game.experimentalShield; } } + + // Note: music is started here only for interceptions. For + // regular missions, it is instead started by + // mission_showStartScreen(). This is necessary to ensure the + // proper music can be played when Kline or the cloak fighter + // are active. + audio_playRandomTrack(); } if (game.area == MISN_VENUS) diff --git a/src/mission.c b/src/mission.c index f4fc73d..b1f1f0c 100644 --- a/src/mission.c +++ b/src/mission.c @@ -1175,10 +1175,12 @@ void mission_showStartScreen() gfx_createTextObject(TS_POWER, "Power", 0, 0, FONT_WHITE); gfx_createTextObject(TS_OUTPUT, "Output", 0, 0, FONT_WHITE); gfx_createTextObject(TS_COOLER, "Cooler", 0, 0, FONT_WHITE); - audio_playRandomTrack(); if (game.area != MISN_INTERCEPTION) { + // Note: music is started here only for regular missions. For + // interceptions, it is instead started by game_mainLoop(). + audio_playRandomTrack(); renderer_update(); player_flushInput();