mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 05:31:00 +00:00
- fixed copy/paste error in P_GetFriction resulting in incorrect calculation of movefactor.
This commit is contained in:
parent
0eb35d6c6e
commit
c2e2910399
2 changed files with 3 additions and 3 deletions
|
@ -1305,7 +1305,7 @@ public:
|
|||
{
|
||||
return Z() < checkz - Z_Epsilon;
|
||||
}
|
||||
bool isAtZ(double checkz)
|
||||
bool isAtZ(double checkz) const
|
||||
{
|
||||
return fabs(Z() - checkz) < Z_Epsilon;
|
||||
}
|
||||
|
|
|
@ -557,7 +557,7 @@ double P_GetFriction(const AActor *mo, double *frictionfactor)
|
|||
if (rover->flags & FF_SOLID)
|
||||
{
|
||||
// Must be standing on a solid floor
|
||||
if (mo->Z() != rover->top.plane->ZatPoint(pos)) continue;
|
||||
if (!mo->isAtZ(rover->top.plane->ZatPoint(pos))) continue;
|
||||
}
|
||||
else if (rover->flags & FF_SWIMMABLE)
|
||||
{
|
||||
|
@ -573,7 +573,7 @@ double P_GetFriction(const AActor *mo, double *frictionfactor)
|
|||
if (newfriction < friction || friction == ORIG_FRICTION)
|
||||
{
|
||||
friction = newfriction;
|
||||
movefactor = newmf * 0.5;
|
||||
movefactor = newmf;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue