diff --git a/src/d_netcmd.c b/src/d_netcmd.c index dd7981f3..5c8343d6 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -369,13 +369,6 @@ consvar_t cv_speedometer = {"speedometer", "Off", CV_SAVE, speedometer_cons_t, N static CV_PossibleValue_t votetime_cons_t[] = {{10, "MIN"}, {3600, "MAX"}, {0, NULL}}; consvar_t cv_votetime = {"votetime", "20", CV_NETVAR, votetime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t cv_collideminimum_cons_t[] = {{1, "MIN"}, {16384, "MAX"}, {0, NULL}}; -consvar_t cv_collideminimum = {"collide_minspeed", "25", CV_NETVAR, cv_collideminimum_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t cv_collidesoundnum_cons_t[] = {{1, "MIN"}, {1208, "MAX"}, {0, NULL}}; -consvar_t cv_collidesoundnum = {"collide_soundnum", "231", CV_NETVAR, cv_collidesoundnum_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_collidesounds = {"collide_sounds", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; -// - consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, Ringslinger_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_gravity = {"gravity", "0.8", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index f7b978bd..ad957ed7 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -128,11 +128,6 @@ extern consvar_t cv_speedometer; extern consvar_t cv_votetime; -extern consvar_t cv_collideminimum; -extern consvar_t cv_collidesoundnum; -extern consvar_t cv_collidesounds; -// - extern consvar_t cv_itemfinder; extern consvar_t cv_inttime, cv_advancemap, cv_playersforexit; diff --git a/src/k_kart.c b/src/k_kart.c index 184c8003..94ab9077 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -325,9 +325,6 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartmirror); CV_RegisterVar(&cv_speedometer); CV_RegisterVar(&cv_votetime); - CV_RegisterVar(&cv_collideminimum); - CV_RegisterVar(&cv_collidesoundnum); - CV_RegisterVar(&cv_collidesounds); } //} @@ -699,10 +696,7 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid) return; } - if (cv_collidesounds.value == 1) - { - S_StartSound(mobj1, cv_collidesoundnum.value); - } + S_StartSound(mobj1, sfx_s3k49); fx = P_SpawnMobj(mobj1->x/2 + mobj2->x/2, mobj1->y/2 + mobj2->y/2, mobj1->z/2 + mobj2->z/2, MT_BUMP); if (mobj1->eflags & MFE_VERTICALFLIP) diff --git a/src/p_map.c b/src/p_map.c index c36d8efa..9191038b 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -3990,8 +3990,7 @@ bounceback: fx->eflags &= ~MFE_VERTICALFLIP; fx->scale = mo->scale; - if (cv_collidesounds.value == 1) - S_StartSound(mo, cv_collidesoundnum.value); + S_StartSound(mo, sfx_s3k49); } } diff --git a/src/sounds.c b/src/sounds.c index 83413c7b..e6659920 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -420,7 +420,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart bump sound {"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},