delet cv_birdmusic toggle
stuff was from ages ago, we can just check for the feature toggles instead
This commit is contained in:
1 parent
4814088265
commit
51371dce80
8 files changed
+11
-29
No files matched your search
+1
-1
@@ -2288,7 +2288,7 @@ void G_PlayerReborn(INT32 player)
|
||||
}
|
||||
|
||||
/* I'm putting this here because lol */
|
||||
fade = (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(p));
|
||||
fade = (cv_fading.value && P_IsLocalPlayer(p));
|
||||
|
||||
if (fade)
|
||||
{
|
||||
|
||||
+2
-2
@@ -6479,7 +6479,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
||||
}
|
||||
player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
|
||||
|
||||
if (P_IsLocalPlayer(player) && cv_supermusic.value == 1 && cv_birdmusic.value)
|
||||
if (cv_supermusic.value == 1 && P_IsLocalPlayer(player))
|
||||
S_ChangeMusicSpecial("kinvnc");
|
||||
|
||||
P_RestoreMusic(player);
|
||||
@@ -6683,7 +6683,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
||||
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
|
||||
player->mo->destscale = (6*player->mo->destscale)/8;
|
||||
player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
|
||||
if (P_IsLocalPlayer(player) && cv_growmusic.value == 1 && cv_birdmusic.value )
|
||||
if (cv_growmusic.value == 1 && P_IsLocalPlayer(player))
|
||||
S_ChangeMusicSpecial("kgrow");
|
||||
P_RestoreMusic(player);
|
||||
S_StartSound(player->mo, sfx_kc5a);
|
||||
|
||||
+3
-19
@@ -2026,11 +2026,10 @@ static menuitem_t OP_BirdMenu[] =
|
||||
//{IT_STRING | IT_CVAR, NULL, "Encore Choices", &cv_encorevotes, 90},
|
||||
|
||||
{IT_HEADER, NULL, "Music", NULL, 70},
|
||||
{IT_STRING | IT_CVAR, NULL, "Music Features", &cv_birdmusic, 80},
|
||||
{IT_STRING | IT_CVAR, NULL, "Resume Level Music", &cv_resume, 95},
|
||||
{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 105},
|
||||
{IT_STRING | IT_CVAR, NULL, "Resume Level Music", &cv_resume, 80},
|
||||
{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 95},
|
||||
|
||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 130},
|
||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 120},
|
||||
};
|
||||
|
||||
static const char* OP_BirdTooltips[] =
|
||||
@@ -2044,7 +2043,6 @@ static const char* OP_BirdTooltips[] =
|
||||
//"Only show one battle choice in map vote",
|
||||
//"Amount of encore choices in map vote.",
|
||||
NULL,
|
||||
"Global toggle for all bird music features.",
|
||||
"Resume level music from last position after music change.",
|
||||
"Restart Special music if item is used again.",
|
||||
"Options for advanced music settings.",
|
||||
@@ -2058,7 +2056,6 @@ enum
|
||||
viewpointext,
|
||||
freeplaytext,
|
||||
headermusic,
|
||||
birdmusic,
|
||||
lvlresum,
|
||||
spclresum,
|
||||
advmusic,
|
||||
@@ -2885,19 +2882,6 @@ void Bird_menu_Onchange(void)
|
||||
OP_AdvancedBirdMenu[fadegrow].status = status;
|
||||
OP_AdvancedBirdMenu[respawnfadeout].status = status;
|
||||
OP_AdvancedBirdMenu[respawnfadein].status = status;
|
||||
|
||||
if (cv_birdmusic.value)
|
||||
{
|
||||
OP_BirdMenu[lvlresum].status = IT_STRING | IT_CVAR;
|
||||
OP_BirdMenu[spclresum].status = IT_STRING | IT_CVAR;
|
||||
OP_BirdMenu[advmusic].status = IT_STRING | IT_SUBMENU;
|
||||
}
|
||||
else
|
||||
{
|
||||
OP_BirdMenu[lvlresum].status = IT_GRAYEDOUT;
|
||||
OP_BirdMenu[spclresum].status = IT_GRAYEDOUT;
|
||||
OP_BirdMenu[advmusic].status = IT_GRAYEDOUT;
|
||||
}
|
||||
}
|
||||
|
||||
//menu code is nice
|
||||
|
||||
+1
-1
@@ -1605,7 +1605,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
||||
|
||||
target->player->playerstate = PST_DEAD;
|
||||
|
||||
if (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(target->player))
|
||||
if (cv_fading.value && P_IsLocalPlayer(target->player))
|
||||
{
|
||||
if (netgame || multiplayer)
|
||||
ms = cv_respawntime.value * 1000;
|
||||
|
||||
@@ -700,6 +700,7 @@ void P_RestoreMusic(player_t *player)
|
||||
if (P_EndingMusic(player))
|
||||
return;
|
||||
|
||||
// Event - Level Start
|
||||
if (leveltime < MUSICSTARTTIME)
|
||||
S_StartMapMusic();
|
||||
else // see also where time overs are handled - search for "lives = 2" in this file
|
||||
|
||||
+2
-4
@@ -114,7 +114,6 @@ consvar_t cv_respawnfademusicback = {"respawnfademusicback", "500", CV_SAVE, CV_
|
||||
consvar_t cv_resetspecialmusic = {"resetspecialmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_resume = {"resume", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_fading = {"fading", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_birdmusic = {"birdmusicstuff", "No", CV_SAVE|CV_CALL, CV_YesNo, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
consvar_t cv_keepmusic = {"keepmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_skipintromusic = {"skipintromusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
@@ -310,7 +309,6 @@ void S_RegisterSoundStuff(void)
|
||||
|
||||
CV_RegisterVar(&cv_resume);
|
||||
CV_RegisterVar(&cv_fading);
|
||||
CV_RegisterVar(&cv_birdmusic);
|
||||
// bird music stuff end
|
||||
|
||||
CV_RegisterVar(&cv_keepmusic);
|
||||
@@ -1854,7 +1852,7 @@ void S_StopMusic(void)
|
||||
|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
|
||||
return;
|
||||
|
||||
mapmusic.resume = (cv_birdmusic.value && fasticmp(music.name, mapmusic.name)) ? I_GetSongPosition() : 0;
|
||||
mapmusic.resume = (cv_resume.value && fasticmp(music.name, mapmusic.name)) ? I_GetSongPosition() : 0;
|
||||
|
||||
S_SetKeepMusResume();
|
||||
|
||||
@@ -1906,7 +1904,7 @@ void S_SetMusicVolume(INT32 volume)
|
||||
|
||||
void S_SetRestoreMusicFadeInCvar(consvar_t *cv)
|
||||
{
|
||||
music_refade_cv = cv_birdmusic.value ? cv : 0;
|
||||
music_refade_cv = cv;
|
||||
}
|
||||
|
||||
int S_GetRestoreMusicFadeIn(void)
|
||||
|
||||
@@ -68,7 +68,6 @@ extern consvar_t cv_resetspecialmusic;
|
||||
|
||||
extern consvar_t cv_resume;
|
||||
extern consvar_t cv_fading;
|
||||
extern consvar_t cv_birdmusic;
|
||||
|
||||
extern consvar_t cv_keepmusic;
|
||||
extern consvar_t cv_skipintromusic;
|
||||
|
||||
@@ -626,7 +626,7 @@ static void Countstutter(int len)
|
||||
{
|
||||
UINT32 bytes;
|
||||
|
||||
if (!cv_birdmusic.value || gamestate != GS_LEVEL)
|
||||
if (gamestate != GS_LEVEL)
|
||||
return;
|
||||
|
||||
if (hu_stopped)
|
||||
|
||||
Reference in new issue
Block a user