zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NOFRICTION now applies to Z friction when flying or swimming

This commit is contained in:
Ijon 2018-12-26 18:19:50 -06:00 committed by Christoph Oelckers
parent 23f2a3a7fc
commit 071347d7fb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_mobj.cpp
View File

@ -2530,9 +2530,13 @@ void P_ZMovement (AActor *mo, double oldfloorz)
{ {
mo->AddZ(DAngle(360 / 80.f * level.maptime).Sin() / 8); mo->AddZ(DAngle(360 / 80.f * level.maptime).Sin() / 8);
} }
mo->Vel.Z *= FRICTION_FLY;
if (!(mo->flags8 & MF8_NOFRICTION))
{
mo->Vel.Z *= FRICTION_FLY;
}
} }
if (mo->waterlevel && !(mo->flags & MF_NOGRAVITY)) if (mo->waterlevel && !(mo->flags & MF_NOGRAVITY) && !(mo->flags8 & MF8_NOFRICTION))
{ {
double friction = -1; double friction = -1;