FWGS/hlsdk-xash3d
2
0
Fork 0
mirror of https://github.com/FWGS/hlsdk-xash3d synced 2024-11-23 02:16:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge full player movement unstuck code from HL25 Update.

Browse Source
This commit is contained in:
Andrey Akhmichin 2024-10-14 00:12:36 +05:00
parent 35f1388bd7
commit 5bb2762190
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pm_shared/pm_shared.c
View File

@ -946,7 +946,10 @@ int PM_FlyMove( void )
// modify original_velocity so it parallels all of the clip planes
//
if( pmove->movetype == MOVETYPE_WALK && ( ( pmove->onground == -1 ) || ( pmove->friction != 1 ) ) ) // relfect player velocity
// reflect player velocity
// Only give this a try for first impact plane because you can get yourself stuck in an acute corner by jumping in place
// and pressing forward and nobody was really using this bounce/reflection feature anyway...
if( numplanes == 1 && pmove->movetype == MOVETYPE_WALK && ( ( pmove->onground == -1 ) || ( pmove->friction != 1 )))
{
for( i = 0; i < numplanes; i++ )
{
@ -2860,6 +2863,15 @@ void PM_CheckParamters( void )
pmove->maxspeed = min( maxspeed, pmove->maxspeed );
}
// Slow down, I'm pulling it! (a box maybe) but only when I'm standing on ground
//
// JoshA: Moved this to CheckParamters rather than working on the velocity,
// as otherwise it affects every integration step incorrectly.
if( ( pmove->onground != -1 ) && ( pmove->cmd.buttons & IN_USE ))
{
pmove->maxspeed *= 1.0f / 3.0f;
}
if( ( spd != 0.0f ) && ( spd > pmove->maxspeed ) )
{
float fRatio = pmove->maxspeed / spd;
@ -2980,7 +2992,11 @@ void PM_PlayerMove( qboolean server )
{
if( PM_CheckStuck() )
{
return; // Can't move, we're stuck
// Let the user try to duck to get unstuck
PM_Duck();
if( PM_CheckStuck() )
return; // Can't move, we're stuck
}
}
@ -3026,12 +3042,6 @@ void PM_PlayerMove( qboolean server )
}
}
// Slow down, I'm pulling it! (a box maybe) but only when I'm standing on ground
if( ( pmove->onground != -1 ) && ( pmove->cmd.buttons & IN_USE ) )
{
VectorScale( pmove->velocity, 0.3, pmove->velocity );
}
// Handle movement
switch( pmove->movetype )
{