ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-01-22 01:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed sv_jumpmode 1 server/client prediction and made it default again

Browse source
This commit is contained in:
pierow 2018-08-14 22:51:44 -04:00
parent 2ddac0e9f5
commit 25fef4826c
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/source/dlls/game.cpp
View file

@ -121,7 +121,7 @@ cvar_t avh_autoconcede = {kvAutoConcede, "4", FCVAR_SERVER};
cvar_t avh_combattime = {kvCombatTime, "10", FCVAR_SERVER};
cvar_t avh_mapvoteratio = {kvMapVoteRatio, ".6", FCVAR_SERVER};
cvar_t avh_blockscripts = {kvBlockScripts, "1", FCVAR_SERVER};
cvar_t avh_jumpmode = {kvJumpMode, "2", FCVAR_SERVER};
cvar_t avh_jumpmode = {kvJumpMode, "1", FCVAR_SERVER};
#ifdef DEBUG
cvar_t avh_testing = {kvTesting, "0", FCVAR_SERVER};
#endif

10
main/source/pm_shared/pm_shared.cpp
View file

@ -132,7 +132,6 @@ bool AvHSHUGetCenterPositionForGroup(int inGroupNumber, float* inPlayerOrigin, f
float PM_GetDesiredTopDownCameraHeight(qboolean& outFoundEntity);
qboolean PM_CanWalljump();
qboolean PM_CanFlap();
qboolean jumpheld;
void PM_Overwatch();
bool PM_TopDown();
void PM_Jump(void);
@ -5342,8 +5341,7 @@ void PM_Jump (void)
if (pmove->dead || GetHasUpgrade(pmove->iuser4, MASK_ENSNARED))
{
//pmove->oldbuttons |= IN_JUMP ; // don't jump again until released
jumpheld = true;
pmove->flags |= FL_JUMPHELD;
return;
}
@ -5474,7 +5472,7 @@ void PM_Jump (void)
if (queuedjump)
{
if (jumpheld)
if (pmove->flags & FL_JUMPHELD)
return;
}
@ -5530,7 +5528,7 @@ void PM_Jump (void)
// Flag that we jumped.
//pmove->oldbuttons |= IN_JUMP; // don't jump again until released
jumpheld = true;
pmove->flags |= FL_JUMPHELD;
}
/*
@ -6701,7 +6699,7 @@ void PM_PlayerMove ( qboolean server )
else
{
pmove->oldbuttons &= ~IN_JUMP;
jumpheld = false;
pmove->flags &= ~FL_JUMPHELD;
}
// Fricion is handled before we add in any base velocity. That way, if we are on a conveyor,