From dc350a77df4f43e73510b9d190fb9f965024f6ec Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 18 Sep 2022 04:43:58 -0400 Subject: [PATCH] Remove old powerup warning option --- src/d_netcmd.c | 2 -- src/d_netcmd.h | 1 - src/k_kart.c | 25 ++++++------------------- src/k_menudef.c | 3 --- src/objects/shrink.c | 2 +- src/sounds.c | 2 -- src/sounds.h | 2 -- 7 files changed, 7 insertions(+), 30 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 1f7ef33a2..9dcc990a9 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -409,8 +409,6 @@ consvar_t cv_dualjawz = CVAR_INIT ("dualjawz", "On", CV_NETVAR|CV_CHEAT, C static CV_PossibleValue_t kartminimap_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}}; consvar_t cv_kartminimap = CVAR_INIT ("kartminimap", "4", CV_SAVE, kartminimap_cons_t, NULL); consvar_t cv_kartcheck = CVAR_INIT ("kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL); -static CV_PossibleValue_t kartinvinsfx_cons_t[] = {{0, "Music"}, {1, "SFX"}, {0, NULL}}; -consvar_t cv_kartinvinsfx = CVAR_INIT ("kartinvinsfx", "SFX", CV_SAVE, kartinvinsfx_cons_t, NULL); consvar_t cv_kartspeed = CVAR_INIT ("kartspeed", "Auto", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange); static CV_PossibleValue_t kartbumpers_cons_t[] = {{1, "MIN"}, {12, "MAX"}, {0, NULL}}; consvar_t cv_kartbumpers = CVAR_INIT ("kartbumpers", "3", CV_NETVAR|CV_CHEAT, kartbumpers_cons_t, NULL); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 3a67fc458..1cc3a61d4 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -83,7 +83,6 @@ extern consvar_t cv_tripleorbinaut, cv_quadorbinaut, cv_dualjawz; extern consvar_t cv_kartminimap; extern consvar_t cv_kartcheck; -extern consvar_t cv_kartinvinsfx; extern consvar_t cv_kartspeed; extern consvar_t cv_kartbumpers; extern consvar_t cv_kartfrantic; diff --git a/src/k_kart.c b/src/k_kart.c index 03859aee6..05f2cd4cf 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -241,7 +241,6 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartminimap); CV_RegisterVar(&cv_kartcheck); - CV_RegisterVar(&cv_kartinvinsfx); CV_RegisterVar(&cv_kartspeed); CV_RegisterVar(&cv_kartbumpers); CV_RegisterVar(&cv_kartfrantic); @@ -5796,7 +5795,7 @@ void K_DoInvincibility(player_t *player, tic_t time) } else //used to be "if (P_IsDisplayPlayer(player) == false)" { - S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmi : sfx_kinvnc)); + S_StartSound(player->mo, sfx_alarmi); } P_RestoreMusic(player); @@ -7012,20 +7011,10 @@ static void K_UpdateInvincibilitySounds(player_t *player) if (player->mo->health > 0 && !P_IsLocalPlayer(player)) // used to be !P_IsDisplayPlayer(player) { - if (cv_kartinvinsfx.value) - { - if (player->invincibilitytimer > 0) // Prioritize invincibility - sfxnum = sfx_alarmi; - else if (player->growshrinktimer > 0) - sfxnum = sfx_alarmg; - } - else - { - if (player->invincibilitytimer > 0) - sfxnum = sfx_kinvnc; - else if (player->growshrinktimer > 0) - sfxnum = sfx_kgrow; - } + if (player->invincibilitytimer > 0) // Prioritize invincibility + sfxnum = sfx_alarmi; + else if (player->growshrinktimer > 0) + sfxnum = sfx_alarmg; } if (sfxnum != sfx_None && !S_SoundPlaying(player->mo, sfxnum)) @@ -7036,8 +7025,6 @@ static void K_UpdateInvincibilitySounds(player_t *player) S_StopSoundByID(player->mo, this); STOPTHIS(sfx_alarmi); STOPTHIS(sfx_alarmg); - STOPTHIS(sfx_kinvnc); - STOPTHIS(sfx_kgrow); #undef STOPTHIS } @@ -10076,7 +10063,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) } else //used to be "if (P_IsDisplayPlayer(player) == false)" { - S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow)); + S_StartSound(player->mo, sfx_alarmg); } P_RestoreMusic(player); diff --git a/src/k_menudef.c b/src/k_menudef.c index ed1e33c42..d97083509 100644 --- a/src/k_menudef.c +++ b/src/k_menudef.c @@ -871,9 +871,6 @@ menuitem_t OPTIONS_Sound[] = {IT_STRING | IT_CVAR, "Character Voices", "Set how often to play character voices in game.", NULL, {.cvar = &cv_kartvoices}, 0, 0}, - {IT_STRING | IT_CVAR, "Powerup Warning", "Set how to warn you from other player's powerups such as Invincibility.", - NULL, {.cvar = &cv_kartinvinsfx}, 0, 0}, - {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, diff --git a/src/objects/shrink.c b/src/objects/shrink.c index 10fb2aa10..fda826db6 100644 --- a/src/objects/shrink.c +++ b/src/objects/shrink.c @@ -545,7 +545,7 @@ boolean Obj_ShrinkLaserCollide(mobj_t *gun, mobj_t *victim) } else //used to be "if (P_IsDisplayPlayer(victim->player) == false)" { - S_StartSound(victim, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow)); + S_StartSound(victim, sfx_alarmg); } P_RestoreMusic(victim->player); diff --git a/src/sounds.c b/src/sounds.c index 351e1553f..44f944dc3 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -1054,8 +1054,6 @@ sfxinfo_t S_sfx[NUMSFX] = {"kpogos", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Pogo Spring use {"alarmi", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Invincibility alarm {"alarmg", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Grow alarm - {"kinvnc", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Invincibility music - {"kgrow", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Grow music {"itrol1", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Roulette spinning {"itrol2", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"itrol3", true, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, diff --git a/src/sounds.h b/src/sounds.h index e7248a369..874ce9896 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -1118,8 +1118,6 @@ typedef enum sfx_kpogos, sfx_alarmi, sfx_alarmg, - sfx_kinvnc, - sfx_kgrow, sfx_itrol1, sfx_itrol2, sfx_itrol3,