FWGS/hlsdk-xash3d
2
0
Fork 0
mirror of https://github.com/FWGS/hlsdk-xash3d synced 2024-11-24 10:50:48 +01:00
Code Issues Projects Releases Wiki Activity

Add a cvar fixing pushable excessive acceleration (#343)

Browse Source
This commit is contained in:
Roman Chistokhodov 2022-11-25 12:41:42 +03:00 committed by GitHub
parent 813aa0ae91
commit 1c80e4bbcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/func_break.cpp
View File

@ -26,6 +26,7 @@
#include "func_break.h"
#include "decals.h"
#include "explode.h"
#include "game.h"
extern DLL_GLOBAL Vector g_vecAttackDir;
@ -925,12 +926,24 @@ void CPushable::Move( CBaseEntity *pOther, int push )
return;
}
// g-cont. fix pushable acceleration bug (reverted as it used in mods)
if( pOther->IsPlayer() )
{
// Don't push unless the player is pushing forward and NOT use (pull)
if( push && !( pevToucher->button & ( IN_FORWARD | IN_USE ) ) )
return;
// g-cont. fix pushable acceleration bug (now implemented as cvar)
if (pushablemode.value == 1)
{
// Allow player push when moving right, left and back too
if ( push && !(pevToucher->button & (IN_FORWARD|IN_MOVERIGHT|IN_MOVELEFT|IN_BACK)) )
return;
// Require player walking back when applying '+use' on pushable
if ( !push && !(pevToucher->button & (IN_BACK)) )
return;
}
else
{
// Don't push unless the player is pushing forward and NOT use (pull)
if( push && !( pevToucher->button & ( IN_FORWARD | IN_USE ) ) )
return;
}
playerTouch = 1;
}
@ -951,6 +964,13 @@ void CPushable::Move( CBaseEntity *pOther, int push )
else
factor = 0.25f;
// Spirit fix for pushable acceleration
if (pushablemode.value == 2)
{
if (!push)
factor *= 0.5f;
}
pev->velocity.x += pevToucher->velocity.x * factor;
pev->velocity.y += pevToucher->velocity.y * factor;

2
dlls/game.cpp
View File

@ -38,6 +38,7 @@ cvar_t satchelfix = { "satchelfix", "0", FCVAR_SERVER };
cvar_t explosionfix = { "explosionfix", "0", FCVAR_SERVER };
cvar_t monsteryawspeedfix = { "monsteryawspeedfix", "1", FCVAR_SERVER };
cvar_t corpsephysics = { "corpsephysics", "0", FCVAR_SERVER };
cvar_t pushablemode = { "pushablemode", "0", FCVAR_SERVER };
cvar_t forcerespawn = { "mp_forcerespawn","1", FCVAR_SERVER };
cvar_t flashlight = { "mp_flashlight","0", FCVAR_SERVER };
cvar_t aimcrosshair = { "mp_autocrosshair","1", FCVAR_SERVER };
@ -491,6 +492,7 @@ void GameDLLInit( void )
CVAR_REGISTER( &explosionfix );
CVAR_REGISTER( &monsteryawspeedfix );
CVAR_REGISTER( &corpsephysics );
CVAR_REGISTER( &pushablemode );
CVAR_REGISTER( &forcerespawn );
CVAR_REGISTER( &flashlight );
CVAR_REGISTER( &aimcrosshair );

1
dlls/game.h
View File

@ -33,6 +33,7 @@ extern cvar_t satchelfix;
extern cvar_t explosionfix;
extern cvar_t monsteryawspeedfix;
extern cvar_t corpsephysics;
extern cvar_t pushablemode;
extern cvar_t forcerespawn;
extern cvar_t flashlight;
extern cvar_t aimcrosshair;