nullprop/halflife-photomode
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[HL25] Backport client stuck fixes

Browse source
This commit is contained in:
Joël Troch 2024-08-28 16:36:49 +02:00
parent 95fdebe75c
commit 854187a573
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pm_shared/pm_shared.cpp
View file

@ -969,8 +969,10 @@ int PM_FlyMove()
// 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
// relfect 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++)
{
@ -1748,9 +1750,9 @@ bool PM_CheckStuck()
VectorCopy(pmove->origin, base);
//
// Deal with precision error in network.
// Deal with precision error in network and cases where the player can get stuck on level transitions in singleplayer.
//
if (0 == pmove->server)
if (0 == pmove->server || 0 == pmove->multiplayer)
{
// World or BSP model
if ((hitent == 0) ||
@ -1775,8 +1777,6 @@ bool PM_CheckStuck()
}
}
// Only an issue on the client.
// Always check if we've just changed levels.
if (!(pmove->server != 0 && g_CheckForPlayerStuck))
{
@ -3073,7 +3073,13 @@ 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
}
}
}