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

NOFRICTION now applies to Z friction when flying or swimming

Browse source
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

6
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);
} }
if (!(mo->flags8 & MF8_NOFRICTION))
{
mo->Vel.Z *= FRICTION_FLY; 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;