mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-28 14:31:15 +00:00
All internal music changes use new lump names
... that all start with _ for reasons specified in the music topic
This commit is contained in:
parent
ed69520004
commit
577afbc693
6 changed files with 29 additions and 29 deletions
|
@ -559,7 +559,7 @@ static void F_IntroDrawScene(void)
|
||||||
if (finalecount < 4)
|
if (finalecount < 4)
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
if (finalecount == 4)
|
if (finalecount == 4)
|
||||||
S_ChangeMusicInternal("stjr", false);
|
S_ChangeMusicInternal("_stjr", false);
|
||||||
x = (BASEVIDWIDTH<<FRACBITS)/2 - FixedMul(334<<FRACBITS, aspect)/2;
|
x = (BASEVIDWIDTH<<FRACBITS)/2 - FixedMul(334<<FRACBITS, aspect)/2;
|
||||||
y = (BASEVIDHEIGHT<<FRACBITS)/2 - FixedMul(358<<FRACBITS, aspect)/2;
|
y = (BASEVIDHEIGHT<<FRACBITS)/2 - FixedMul(358<<FRACBITS, aspect)/2;
|
||||||
V_DrawSciencePatch(x, y, 0, (patch = W_CachePatchName("WAHH1", PU_CACHE)), aspect);
|
V_DrawSciencePatch(x, y, 0, (patch = W_CachePatchName("WAHH1", PU_CACHE)), aspect);
|
||||||
|
@ -771,7 +771,7 @@ void F_IntroDrawer(void)
|
||||||
F_RunWipe(99,true);
|
F_RunWipe(99,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
S_ChangeMusicInternal("read_m", false);
|
S_ChangeMusicInternal("_intro", false);
|
||||||
}
|
}
|
||||||
else if (intro_scenenum == 3)
|
else if (intro_scenenum == 3)
|
||||||
roidtics = BASEVIDWIDTH - 64;
|
roidtics = BASEVIDWIDTH - 64;
|
||||||
|
@ -1125,7 +1125,7 @@ void F_StartCredits(void)
|
||||||
CON_ClearHUD();
|
CON_ClearHUD();
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
|
|
||||||
S_ChangeMusicInternal("credit", false);
|
S_ChangeMusicInternal("_creds", false);
|
||||||
|
|
||||||
finalecount = 0;
|
finalecount = 0;
|
||||||
animtimer = 0;
|
animtimer = 0;
|
||||||
|
@ -1422,7 +1422,7 @@ void F_StartTitleScreen(void)
|
||||||
|
|
||||||
// IWAD dependent stuff.
|
// IWAD dependent stuff.
|
||||||
|
|
||||||
S_ChangeMusicInternal("titles", looptitle);
|
S_ChangeMusicInternal("_title", looptitle);
|
||||||
|
|
||||||
animtimer = 0;
|
animtimer = 0;
|
||||||
|
|
||||||
|
@ -1588,7 +1588,7 @@ void F_StartContinue(void)
|
||||||
// In case menus are still up?!!
|
// In case menus are still up?!!
|
||||||
M_ClearMenus(true);
|
M_ClearMenus(true);
|
||||||
|
|
||||||
S_ChangeMusicInternal("contsc", false);
|
S_ChangeMusicInternal("_conti", false);
|
||||||
S_StopSounds();
|
S_StopSounds();
|
||||||
|
|
||||||
timetonext = TICRATE*11;
|
timetonext = TICRATE*11;
|
||||||
|
|
16
src/m_menu.c
16
src/m_menu.c
|
@ -4751,7 +4751,7 @@ static void M_SetupChoosePlayer(INT32 choice)
|
||||||
if (Playing() == false)
|
if (Playing() == false)
|
||||||
{
|
{
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
S_ChangeMusicInternal("chrsel", true);
|
S_ChangeMusicInternal("_chsel", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
SP_PlayerDef.prevMenu = currentMenu;
|
SP_PlayerDef.prevMenu = currentMenu;
|
||||||
|
@ -5202,7 +5202,7 @@ void M_DrawTimeAttackMenu(void)
|
||||||
lumpnum_t lumpnum;
|
lumpnum_t lumpnum;
|
||||||
char beststr[40];
|
char beststr[40];
|
||||||
|
|
||||||
S_ChangeMusicInternal("racent", true); // Eww, but needed for when user hits escape during demo playback
|
S_ChangeMusicInternal("_inter", true); // Eww, but needed for when user hits escape during demo playback
|
||||||
|
|
||||||
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
|
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
|
||||||
|
|
||||||
|
@ -5365,7 +5365,7 @@ static void M_TimeAttack(INT32 choice)
|
||||||
itemOn = tastart; // "Start" is selected.
|
itemOn = tastart; // "Start" is selected.
|
||||||
|
|
||||||
G_SetGamestate(GS_TIMEATTACK);
|
G_SetGamestate(GS_TIMEATTACK);
|
||||||
S_ChangeMusicInternal("racent", true);
|
S_ChangeMusicInternal("_inter", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Drawing function for Nights Attack
|
// Drawing function for Nights Attack
|
||||||
|
@ -5375,7 +5375,7 @@ void M_DrawNightsAttackMenu(void)
|
||||||
lumpnum_t lumpnum;
|
lumpnum_t lumpnum;
|
||||||
char beststr[40];
|
char beststr[40];
|
||||||
|
|
||||||
S_ChangeMusicInternal("racent", true); // Eww, but needed for when user hits escape during demo playback
|
S_ChangeMusicInternal("_inter", true); // Eww, but needed for when user hits escape during demo playback
|
||||||
|
|
||||||
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
|
V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
|
||||||
|
|
||||||
|
@ -5498,7 +5498,7 @@ static void M_NightsAttack(INT32 choice)
|
||||||
itemOn = nastart; // "Start" is selected.
|
itemOn = nastart; // "Start" is selected.
|
||||||
|
|
||||||
G_SetGamestate(GS_TIMEATTACK);
|
G_SetGamestate(GS_TIMEATTACK);
|
||||||
S_ChangeMusicInternal("racent", true);
|
S_ChangeMusicInternal("_inter", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Player has selected the "START" from the nights attack screen
|
// Player has selected the "START" from the nights attack screen
|
||||||
|
@ -5732,7 +5732,7 @@ static void M_ModeAttackEndGame(INT32 choice)
|
||||||
itemOn = currentMenu->lastOn;
|
itemOn = currentMenu->lastOn;
|
||||||
G_SetGamestate(GS_TIMEATTACK);
|
G_SetGamestate(GS_TIMEATTACK);
|
||||||
modeattacking = ATTACKING_NONE;
|
modeattacking = ATTACKING_NONE;
|
||||||
S_ChangeMusicInternal("racent", true);
|
S_ChangeMusicInternal("_inter", true);
|
||||||
// Update replay availability.
|
// Update replay availability.
|
||||||
CV_AddValue(&cv_nextmap, 1);
|
CV_AddValue(&cv_nextmap, 1);
|
||||||
CV_AddValue(&cv_nextmap, -1);
|
CV_AddValue(&cv_nextmap, -1);
|
||||||
|
@ -6938,7 +6938,7 @@ static void M_ToggleDigital(void)
|
||||||
if (nodigimusic) return;
|
if (nodigimusic) return;
|
||||||
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
|
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
S_ChangeMusicInternal("lclear", false);
|
S_ChangeMusicInternal("_clear", false);
|
||||||
M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
|
M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -6965,7 +6965,7 @@ static void M_ToggleMIDI(void)
|
||||||
I_InitMIDIMusic();
|
I_InitMIDIMusic();
|
||||||
if (nomidimusic) return;
|
if (nomidimusic) return;
|
||||||
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
|
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
|
||||||
S_ChangeMusicInternal("lclear", false);
|
S_ChangeMusicInternal("_clear", false);
|
||||||
M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
|
M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -3064,7 +3064,7 @@ void A_Invincibility(mobj_t *actor)
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
if (mariomode)
|
if (mariomode)
|
||||||
G_GhostAddColor(GHC_INVINCIBLE);
|
G_GhostAddColor(GHC_INVINCIBLE);
|
||||||
S_ChangeMusicInternal((mariomode) ? "minvnc" : "invinc", false);
|
S_ChangeMusicInternal((mariomode) ? "_minv" : "_inv", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3100,7 +3100,7 @@ void A_SuperSneakers(mobj_t *actor)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
S_ChangeMusicInternal("shoes", false);
|
S_ChangeMusicInternal("_shoes", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2081,7 +2081,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
|
||||||
if (P_IsLocalPlayer(target->player) && target->player == &players[consoleplayer])
|
if (P_IsLocalPlayer(target->player) && target->player == &players[consoleplayer])
|
||||||
{
|
{
|
||||||
S_StopMusic(); // Stop the Music! Tails 03-14-2000
|
S_StopMusic(); // Stop the Music! Tails 03-14-2000
|
||||||
S_ChangeMusicInternal("gmover", false); // Yousa dead now, Okieday? Tails 03-14-2000
|
S_ChangeMusicInternal("_gover", false); // Yousa dead now, Okieday? Tails 03-14-2000
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2478,7 +2478,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
|
||||||
&& player->nightstime < 10*TICRATE)
|
&& player->nightstime < 10*TICRATE)
|
||||||
{
|
{
|
||||||
//S_StartSound(NULL, sfx_timeup); // that creepy "out of time" music from NiGHTS. Dummied out, as some on the dev team thought it wasn't Sonic-y enough (Mystic, notably). Uncomment to restore. -SH
|
//S_StartSound(NULL, sfx_timeup); // that creepy "out of time" music from NiGHTS. Dummied out, as some on the dev team thought it wasn't Sonic-y enough (Mystic, notably). Uncomment to restore. -SH
|
||||||
S_ChangeMusicInternal("drown",false);
|
S_ChangeMusicInternal("_drown",false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
16
src/p_user.c
16
src/p_user.c
|
@ -965,7 +965,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings)
|
||||||
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC) && P_IsLocalPlayer(player))
|
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC) && P_IsLocalPlayer(player))
|
||||||
{
|
{
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
S_ChangeMusicInternal("supers", true);
|
S_ChangeMusicInternal("_super", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_supert); //let all players hear it -mattw_cfi
|
S_StartSound(NULL, sfx_supert); //let all players hear it -mattw_cfi
|
||||||
|
@ -1101,7 +1101,7 @@ void P_PlayLivesJingle(player_t *player)
|
||||||
if (player)
|
if (player)
|
||||||
player->powers[pw_extralife] = extralifetics + 1;
|
player->powers[pw_extralife] = extralifetics + 1;
|
||||||
S_StopMusic(); // otherwise it won't restart if this is done twice in a row
|
S_StopMusic(); // otherwise it won't restart if this is done twice in a row
|
||||||
S_ChangeMusicInternal("xtlife", false);
|
S_ChangeMusicInternal("_1up", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1119,9 +1119,9 @@ void P_RestoreMusic(player_t *player)
|
||||||
return;
|
return;
|
||||||
S_SpeedMusic(1.0f);
|
S_SpeedMusic(1.0f);
|
||||||
if (player->powers[pw_super] && !(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC))
|
if (player->powers[pw_super] && !(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC))
|
||||||
S_ChangeMusicInternal("supers", true);
|
S_ChangeMusicInternal("_1up", true);
|
||||||
else if (player->powers[pw_invulnerability] > 1)
|
else if (player->powers[pw_invulnerability] > 1)
|
||||||
S_ChangeMusicInternal((mariomode) ? "minvnc" : "invinc", false);
|
S_ChangeMusicInternal((mariomode) ? "_minv" : "_inv", false);
|
||||||
else if (player->powers[pw_sneakers] > 1 && !player->powers[pw_super])
|
else if (player->powers[pw_sneakers] > 1 && !player->powers[pw_super])
|
||||||
{
|
{
|
||||||
if (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC)
|
if (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC)
|
||||||
|
@ -1130,7 +1130,7 @@ void P_RestoreMusic(player_t *player)
|
||||||
S_ChangeMusic(mapmusname, mapmusflags, true);
|
S_ChangeMusic(mapmusname, mapmusflags, true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
S_ChangeMusicInternal("shoes", true);
|
S_ChangeMusicInternal("_shoes", true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
S_ChangeMusic(mapmusname, mapmusflags, true);
|
S_ChangeMusic(mapmusname, mapmusflags, true);
|
||||||
|
@ -2081,7 +2081,7 @@ static void P_CheckUnderwaterAndSpaceTimer(player_t *player)
|
||||||
&& player == &players[consoleplayer])
|
&& player == &players[consoleplayer])
|
||||||
{
|
{
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
S_ChangeMusicInternal("drown", false);
|
S_ChangeMusicInternal("_drown", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->powers[pw_underwater] == 25*TICRATE + 1)
|
if (player->powers[pw_underwater] == 25*TICRATE + 1)
|
||||||
|
@ -5618,7 +5618,7 @@ static void P_NiGHTSMovement(player_t *player)
|
||||||
}
|
}
|
||||||
else if (P_IsLocalPlayer(player) && player->nightstime == 10*TICRATE)
|
else if (P_IsLocalPlayer(player) && player->nightstime == 10*TICRATE)
|
||||||
// S_StartSound(NULL, sfx_timeup); // that creepy "out of time" music from NiGHTS. Dummied out, as some on the dev team thought it wasn't Sonic-y enough (Mystic, notably). Uncomment to restore. -SH
|
// S_StartSound(NULL, sfx_timeup); // that creepy "out of time" music from NiGHTS. Dummied out, as some on the dev team thought it wasn't Sonic-y enough (Mystic, notably). Uncomment to restore. -SH
|
||||||
S_ChangeMusicInternal("drown",false);
|
S_ChangeMusicInternal("_drown",false);
|
||||||
|
|
||||||
|
|
||||||
if (player->mo->z < player->mo->floorz)
|
if (player->mo->z < player->mo->floorz)
|
||||||
|
@ -8747,7 +8747,7 @@ void P_PlayerThink(player_t *player)
|
||||||
if (countdown == 11*TICRATE - 1)
|
if (countdown == 11*TICRATE - 1)
|
||||||
{
|
{
|
||||||
if (P_IsLocalPlayer(player))
|
if (P_IsLocalPlayer(player))
|
||||||
S_ChangeMusicInternal("drown", false);
|
S_ChangeMusicInternal("_drown", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If you've hit the countdown and you haven't made
|
// If you've hit the countdown and you haven't made
|
||||||
|
|
|
@ -632,7 +632,7 @@ void Y_Ticker(void)
|
||||||
boolean anybonuses = false;
|
boolean anybonuses = false;
|
||||||
|
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
S_ChangeMusicInternal("lclear", false); // don't loop it
|
S_ChangeMusicInternal("_clear", false); // don't loop it
|
||||||
|
|
||||||
if (intertic < TICRATE) // one second pause before tally begins
|
if (intertic < TICRATE) // one second pause before tally begins
|
||||||
return;
|
return;
|
||||||
|
@ -693,7 +693,7 @@ void Y_Ticker(void)
|
||||||
|
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
{
|
{
|
||||||
S_ChangeMusicInternal("lclear", false); // don't loop it
|
S_ChangeMusicInternal("_clear", false); // don't loop it
|
||||||
tallydonetic = 0;
|
tallydonetic = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -754,7 +754,7 @@ void Y_Ticker(void)
|
||||||
else if (intertype == int_match || intertype == int_ctf || intertype == int_teammatch) // match
|
else if (intertype == int_match || intertype == int_ctf || intertype == int_teammatch) // match
|
||||||
{
|
{
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
S_ChangeMusicInternal("racent", true); // loop it
|
S_ChangeMusicInternal("_inter", true); // loop it
|
||||||
|
|
||||||
// If a player has left or joined, recalculate scores.
|
// If a player has left or joined, recalculate scores.
|
||||||
if (data.match.numplayers != D_NumPlayers())
|
if (data.match.numplayers != D_NumPlayers())
|
||||||
|
@ -763,7 +763,7 @@ void Y_Ticker(void)
|
||||||
else if (intertype == int_race || intertype == int_classicrace) // race
|
else if (intertype == int_race || intertype == int_classicrace) // race
|
||||||
{
|
{
|
||||||
if (!intertic) // first time only
|
if (!intertic) // first time only
|
||||||
S_ChangeMusicInternal("racent", true); // loop it
|
S_ChangeMusicInternal("_inter", true); // loop it
|
||||||
|
|
||||||
// Don't bother recalcing for race. It doesn't make as much sense.
|
// Don't bother recalcing for race. It doesn't make as much sense.
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue