OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added flags for angle handling on bounce

Browse source 
Allows for keeping the current angle on bounce or modifying the pitch.
This commit is contained in:
Boondorl 2025-01-24 14:07:33 -05:00 • committed by Ricardo Luís Vaz Silva
commit e0394ef16a
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/playsim/p_map.cpp
View file

@ -3653,7 +3653,8 @@ bool FSlide::BounceWall(AActor *mo)
}
moveangle = mo->Vel.Angle();
deltaangle = (lineangle * 2) - moveangle;
mo->Angles.Yaw = deltaangle;
if (!(mo->BounceFlags & BOUNCE_KeepAngle))
mo->Angles.Yaw = deltaangle;
movelen = mo->Vel.XY().Length() * GetWallBounceFactor(mo);
@ -3751,8 +3752,10 @@ bool P_BounceActor(AActor *mo, AActor *BlockingMobj, bool ontop)
DAngle angle = BlockingMobj->AngleTo(mo) + DAngle::fromDeg((pr_bounce() % 16) - 8);
double speed = mo->VelXYToSpeed() * GetWallBounceFactor(mo); // [GZ] was 0.75, using wallbouncefactor seems more consistent
if (fabs(speed) < EQUAL_EPSILON) speed = 0;
mo->Angles.Yaw = angle;
mo->VelFromAngle(speed);
if (!(mo->BounceFlags & BOUNCE_KeepAngle))
mo->Angles.Yaw = angle;
mo->Vel.X = speed * angle.Cos();
mo->Vel.Y = speed * angle.Sin();
mo->PlayBounceSound(true, 1.0);
}
else
@ -3781,6 +3784,9 @@ bool P_BounceActor(AActor *mo, AActor *BlockingMobj, bool ontop)
mo->Vel *= mo->bouncefactor;
}
if (mo->BounceFlags & BOUNCE_ModifyPitch)
mo->Angles.Pitch = -VecToAngle(mo->Vel.XY().Length(), mo->Vel.Z);
mo->PlayBounceSound(true, 1.0);
if (mo->BounceFlags & BOUNCE_MBF) // Bring it to rest below a certain speed
{