fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 01:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added cvars to change/disable the often-unwanted build-in sound effects.

Browse source
This commit is contained in:
Shpoike 2020-01-12 08:05:35 +00:00
parent 17f45103be
commit 08cf018563
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Quake/sv_main.c
View file

@ -1256,6 +1256,9 @@ void SV_Init (void)
extern cvar_t com_protocolname; //spike
extern cvar_t net_masters[]; //spike
extern cvar_t rcon_password; //spike, proquake-compatible rcon
extern cvar_t sv_sound_watersplash; //spike - making these changable is handy...
extern cvar_t sv_sound_land; //spike - and also mutable...
Cvar_RegisterVariable (&sv_maxvelocity);
Cvar_RegisterVariable (&sv_gravity);
@ -1276,6 +1279,9 @@ void SV_Init (void)
Cvar_RegisterVariable (&pr_checkextension);
Cvar_RegisterVariable (&sv_altnoclip); //johnfitz
Cvar_RegisterVariable (&sv_sound_watersplash); //spike
Cvar_RegisterVariable (&sv_sound_land); //spike
if (isDedicated)
sv_public.string = "1";
else

15
Quake/sv_phys.c
View file

@ -49,6 +49,9 @@ cvar_t sv_nostep = {"sv_nostep","0",CVAR_NONE};
cvar_t sv_freezenonclients = {"sv_freezenonclients","0",CVAR_NONE};
cvar_t sv_gameplayfix_spawnbeforethinks = {"sv_gameplayfix_spawnbeforethinks","0",CVAR_NONE};
cvar_t sv_sound_watersplash = {"sv_sound_watersplash", "misc/h2ohit1.wav", CVAR_NONE};
cvar_t sv_sound_land = {"sv_sound_land", "demon/dland2.wav", CVAR_NONE};
#define MOVE_EPSILON 0.01
@ -1085,18 +1088,18 @@ void SV_CheckWaterTransition (edict_t *ent)
if (cont <= CONTENTS_WATER)
{
if (ent->v.watertype == CONTENTS_EMPTY)
if (ent->v.watertype == CONTENTS_EMPTY && *sv_sound_watersplash.string)
{ // just crossed into water
SV_StartSound (ent, NULL, 0, "misc/h2ohit1.wav", 255, 1);
SV_StartSound (ent, NULL, 0, sv_sound_watersplash.string, 255, 1);
}
ent->v.watertype = cont;
ent->v.waterlevel = 1;
}
else
{
if (ent->v.watertype != CONTENTS_EMPTY)
if (ent->v.watertype != CONTENTS_EMPTY && *sv_sound_watersplash.string)
{ // just crossed into water
SV_StartSound (ent, NULL, 0, "misc/h2ohit1.wav", 255, 1);
SV_StartSound (ent, NULL, 0, sv_sound_watersplash.string, 255, 1);
}
ent->v.watertype = CONTENTS_EMPTY;
ent->v.waterlevel = cont;
@ -1252,8 +1255,8 @@ void SV_Physics_Step (edict_t *ent)
if ( (int)ent->v.flags & FL_ONGROUND ) // just hit ground
{
if (hitsound)
SV_StartSound (ent, NULL, 0, "demon/dland2.wav", 255, 1);
if (hitsound && *sv_sound_land.string)
SV_StartSound (ent, NULL, 0, sv_sound_land.string, 255, 1);
}
}