OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- MBF21: more work on flags.

Browse source 
* added handlers for the missing upper flags in the first flag word.
* refactored some code related to MF_BOUNCES to adapt to other flags' changes to avoid constant property updates for too many flags.
* treat anything with RF_ZDOOMTRANS as non-translucent for the purpose of the flag checks.
This commit is contained in:
Christoph Oelckers 2021-07-02 19:48:58 +02:00
commit 9082ef7d49
6 changed files with 157 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/playsim/p_map.cpp
View file

@ -3486,7 +3486,7 @@ bool FSlide::BounceWall(AActor *mo)
deltaangle = (lineangle * 2) - moveangle;
mo->Angles.Yaw = deltaangle;
movelen = mo->Vel.XY().Length() * mo->wallbouncefactor;
movelen = mo->Vel.XY().Length() * GetWallBounceFactor(mo);
FBoundingBox box(mo->X(), mo->Y(), mo->radius);
if (BoxOnLineSide(box, line) == -1)
@ -3573,7 +3573,7 @@ bool P_BounceActor(AActor *mo, AActor *BlockingMobj, bool ontop)
if (!ontop)
{
DAngle angle = BlockingMobj->AngleTo(mo) + ((pr_bounce() % 16) - 8);
double speed = mo->VelXYToSpeed() * mo->wallbouncefactor; // [GZ] was 0.75, using wallbouncefactor seems more consistent
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);
@ -3595,7 +3595,7 @@ bool P_BounceActor(AActor *mo, AActor *BlockingMobj, bool ontop)
}
else
{
mo->Vel.Z *= mo->bouncefactor;
mo->Vel.Z *= GetMBFBounceFactor(mo);
}
}
else // Don't run through this for MBF-style bounces