fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-13 00:34:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix https://github.com/Shpoike/Quakespasm/issues/90

Browse source
This commit is contained in:
Shpoike 2021-11-08 00:17:44 +00:00
parent ca7babd65e
commit e0bae4bce4
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Quake/sv_main.c
View file

@ -1457,6 +1457,7 @@ void SV_Init (void)
extern cvar_t sv_nostep; extern cvar_t sv_nostep;
extern cvar_t sv_freezenonclients; extern cvar_t sv_freezenonclients;
extern cvar_t sv_gameplayfix_spawnbeforethinks; extern cvar_t sv_gameplayfix_spawnbeforethinks;
extern cvar_t sv_gameplayfix_bouncedownslopes;
extern cvar_t sv_gameplayfix_setmodelrealbox; //spike: 1 to replicate a quakespasm bug, 0 for actual vanilla compat. extern cvar_t sv_gameplayfix_setmodelrealbox; //spike: 1 to replicate a quakespasm bug, 0 for actual vanilla compat.
extern cvar_t sv_friction; extern cvar_t sv_friction;
extern cvar_t sv_edgefriction; extern cvar_t sv_edgefriction;
@ -1490,6 +1491,7 @@ void SV_Init (void)
Cvar_RegisterVariable (&sv_nostep); Cvar_RegisterVariable (&sv_nostep);
Cvar_RegisterVariable (&sv_freezenonclients); Cvar_RegisterVariable (&sv_freezenonclients);
Cvar_RegisterVariable (&sv_gameplayfix_spawnbeforethinks); Cvar_RegisterVariable (&sv_gameplayfix_spawnbeforethinks);
Cvar_RegisterVariable (&sv_gameplayfix_bouncedownslopes);
Cvar_RegisterVariable (&sv_gameplayfix_setmodelrealbox); Cvar_RegisterVariable (&sv_gameplayfix_setmodelrealbox);
Cvar_RegisterVariable (&pr_checkextension); Cvar_RegisterVariable (&pr_checkextension);
Cvar_RegisterVariable (&sv_altnoclip); //johnfitz Cvar_RegisterVariable (&sv_altnoclip); //johnfitz

6
Quake/sv_phys.c
View file

@ -48,6 +48,7 @@ cvar_t sv_maxvelocity = {"sv_maxvelocity","2000",CVAR_NONE};
cvar_t sv_nostep = {"sv_nostep","0",CVAR_NONE}; cvar_t sv_nostep = {"sv_nostep","0",CVAR_NONE};
cvar_t sv_freezenonclients = {"sv_freezenonclients","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_gameplayfix_spawnbeforethinks = {"sv_gameplayfix_spawnbeforethinks","0",CVAR_NONE};
cvar_t sv_gameplayfix_bouncedownslopes = {"sv_gameplayfix_bouncedownslopes","0",CVAR_NONE}; //fixes grenades making horrible noises on slopes.
cvar_t sv_sound_watersplash = {"sv_sound_watersplash", "misc/h2ohit1.wav", 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}; cvar_t sv_sound_land = {"sv_sound_land", "demon/dland2.wav", CVAR_NONE};
@ -756,7 +757,8 @@ void SV_PushMove (edict_t *pusher, float movetime)
// remove the onground flag for non-players // remove the onground flag for non-players
if (check->v.movetype != MOVETYPE_WALK) if (check->v.movetype != MOVETYPE_WALK)
check->v.flags = (int)check->v.flags & ~FL_ONGROUND; if (!pr_checkextension.value || PROG_TO_EDICT(check->v.groundentity) != pusher) //unless they're already riding us (prevents grenade sound spam)
check->v.flags = (int)check->v.flags & ~FL_ONGROUND;
VectorCopy (check->v.origin, entorig); VectorCopy (check->v.origin, entorig);
VectorCopy (check->v.origin, moved_from[num_moved]); VectorCopy (check->v.origin, moved_from[num_moved]);
@ -1402,7 +1404,7 @@ void SV_Physics_Toss (edict_t *ent)
// stop if on ground // stop if on ground
if (trace.plane.normal[2] > 0.7) if (trace.plane.normal[2] > 0.7)
{ {
if (ent->v.velocity[2] < 60 || ent->v.movetype != MOVETYPE_BOUNCE) if (ent->v.movetype != MOVETYPE_BOUNCE || (sv_gameplayfix_bouncedownslopes.value?DotProduct(trace.plane.normal, ent->v.velocity):ent->v.velocity[2]) < 60)
{ {
ent->v.flags = (int)ent->v.flags | FL_ONGROUND; ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
ent->v.groundentity = EDICT_TO_PROG(trace.ent); ent->v.groundentity = EDICT_TO_PROG(trace.ent);