From 674f77a9313ff0cbfc9e60e8b1e5227e40a4f126 Mon Sep 17 00:00:00 2001 From: avolkov Date: Wed, 18 May 2005 20:39:36 +0000 Subject: [PATCH] Alternate music tracks (conditional in some cases) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1805 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm/comandr/comandr.c | 9 +++++++++ sc2/src/sc2code/comm/rebel/rebel.c | 4 ++++ sc2/src/sc2code/comm/spahome/spahome.c | 4 ++++ sc2/src/sc2code/comm/spathi/spathic.c | 10 ++++++++++ 4 files changed, 27 insertions(+) diff --git a/sc2/src/sc2code/comm/comandr/comandr.c b/sc2/src/sc2code/comm/comandr/comandr.c index 65abab205..380ab1aa6 100644 --- a/sc2/src/sc2code/comm/comandr/comandr.c +++ b/sc2/src/sc2code/comm/comandr/comandr.c @@ -688,7 +688,16 @@ init_commander_comm () commander_desc.uninit_encounter_func = uninit_commander; if (GET_GAME_STATE (RADIOACTIVES_PROVIDED)) + { commander_desc.AlienAmbientArray[2].AnimFlags |= ANIM_DISABLED; + // regular track -- let's make sure + commander_desc.AlienSongFlags &= ~LDASF_USE_ALTERNATE; + } + else + { // use alternate 'low-power' track if available + commander_desc.AlienAltSong = "comm/comandr/comlowpw.mod"; + commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; + } commander_desc.AlienTextWidth = 143; commander_desc.AlienTextTemplate.baseline.x = 164; diff --git a/sc2/src/sc2code/comm/rebel/rebel.c b/sc2/src/sc2code/comm/rebel/rebel.c index 7b9700d4c..b281e9d98 100644 --- a/sc2/src/sc2code/comm/rebel/rebel.c +++ b/sc2/src/sc2code/comm/rebel/rebel.c @@ -435,6 +435,10 @@ init_rebel_yehat_comm (void) yehat_desc.AlienTextTemplate.valign = VALIGN_MIDDLE; yehat_desc.AlienTextWidth = (SIS_TEXT_WIDTH - 16) * 2 / 3; + // use alternate "Rebels" track if available + yehat_desc.AlienAltSong = "comm/rebel/rebel.mod"; + yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; + SET_GAME_STATE (BATTLE_SEGUE, 0); retval = &yehat_desc; diff --git a/sc2/src/sc2code/comm/spahome/spahome.c b/sc2/src/sc2code/comm/spahome/spahome.c index 0c57bc94c..b1997d0a5 100644 --- a/sc2/src/sc2code/comm/spahome/spahome.c +++ b/sc2/src/sc2code/comm/spahome/spahome.c @@ -997,6 +997,10 @@ init_spahome_comm () spahome_desc.AlienTextTemplate.align = ALIGN_CENTER; spahome_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; + // use alternate "Safe Ones" track if available + spahome_desc.AlienAltSong = "comm/spahome/spahome.mod"; + spahome_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; + if (GET_GAME_STATE (SPATHI_MANNER) == 3) { SET_GAME_STATE (BATTLE_SEGUE, 0); diff --git a/sc2/src/sc2code/comm/spathi/spathic.c b/sc2/src/sc2code/comm/spathi/spathic.c index cea78ef87..15bdaa9a2 100644 --- a/sc2/src/sc2code/comm/spathi/spathic.c +++ b/sc2/src/sc2code/comm/spathi/spathic.c @@ -801,6 +801,16 @@ init_spathi_comm (void) spathi_desc.AlienTextTemplate.align = ALIGN_CENTER; spathi_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; + if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1) + { // use alternate Fwiffo track if available + spathi_desc.AlienAltSong = "comm/spathi/spafwiff.mod"; + spathi_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; + } + else + { // regular track -- let's make sure + spathi_desc.AlienSongFlags &= ~LDASF_USE_ALTERNATE; + } + if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1 || GET_GAME_STATE (SPATHI_MANNER) == 3 || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)