zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-24 04:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed copy/paste error in P_GetFriction resulting in incorrect calculation of movefactor.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-30 10:08:06 +02:00
parent 0eb35d6c6e
commit c2e2910399
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/actor.h
View file

@ -1305,7 +1305,7 @@ public:
{ {
return Z() < checkz - Z_Epsilon; return Z() < checkz - Z_Epsilon;
} }
bool isAtZ(double checkz) bool isAtZ(double checkz) const
{ {
return fabs(Z() - checkz) < Z_Epsilon; return fabs(Z() - checkz) < Z_Epsilon;
} }

4
src/p_map.cpp
View file

@ -557,7 +557,7 @@ double P_GetFriction(const AActor *mo, double *frictionfactor)
if (rover->flags & FF_SOLID) if (rover->flags & FF_SOLID)
{ {
// Must be standing on a solid floor // 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) else if (rover->flags & FF_SWIMMABLE)
{ {
@ -573,7 +573,7 @@ double P_GetFriction(const AActor *mo, double *frictionfactor)
if (newfriction < friction || friction == ORIG_FRICTION) if (newfriction < friction || friction == ORIG_FRICTION)
{ {
friction = newfriction; friction = newfriction;
movefactor = newmf * 0.5; movefactor = newmf;
} }
} }