adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alternate music tracks (conditional in some cases)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1805 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-05-18 20:39:36 +00:00
parent da475b0cea
commit 674f77a931
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/comandr/comandr.c
+9
View File
@@ -688,7 +688,16 @@ init_commander_comm ()
commander_desc.uninit_encounter_func = uninit_commander; commander_desc.uninit_encounter_func = uninit_commander;
if (GET_GAME_STATE (RADIOACTIVES_PROVIDED)) if (GET_GAME_STATE (RADIOACTIVES_PROVIDED))
{
commander_desc.AlienAmbientArray[2].AnimFlags |= ANIM_DISABLED; 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.AlienTextWidth = 143;
commander_desc.AlienTextTemplate.baseline.x = 164; commander_desc.AlienTextTemplate.baseline.x = 164;
sc2/src/sc2code/comm/rebel/rebel.c
+4
View File
@@ -435,6 +435,10 @@ init_rebel_yehat_comm (void)
yehat_desc.AlienTextTemplate.valign = VALIGN_MIDDLE; yehat_desc.AlienTextTemplate.valign = VALIGN_MIDDLE;
yehat_desc.AlienTextWidth = (SIS_TEXT_WIDTH - 16) * 2 / 3; 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); SET_GAME_STATE (BATTLE_SEGUE, 0);
retval = &yehat_desc; retval = &yehat_desc;
sc2/src/sc2code/comm/spahome/spahome.c
+4
View File
@@ -997,6 +997,10 @@ init_spahome_comm ()
spahome_desc.AlienTextTemplate.align = ALIGN_CENTER; spahome_desc.AlienTextTemplate.align = ALIGN_CENTER;
spahome_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; 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) if (GET_GAME_STATE (SPATHI_MANNER) == 3)
{ {
SET_GAME_STATE (BATTLE_SEGUE, 0); SET_GAME_STATE (BATTLE_SEGUE, 0);
sc2/src/sc2code/comm/spathi/spathic.c
+10
View File
@@ -801,6 +801,16 @@ init_spathi_comm (void)
spathi_desc.AlienTextTemplate.align = ALIGN_CENTER; spathi_desc.AlienTextTemplate.align = ALIGN_CENTER;
spathi_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; 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 if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1
|| GET_GAME_STATE (SPATHI_MANNER) == 3 || GET_GAME_STATE (SPATHI_MANNER) == 3
|| LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)