mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 08:52:00 +00:00
- Remove DCoreActor::ZeroVelocityXY()
.
This commit is contained in:
parent
7dd5cdb86c
commit
39d1a758ed
5 changed files with 7 additions and 12 deletions
|
@ -91,11 +91,6 @@ public:
|
|||
spr.angle = spr.angle.Normalized360();
|
||||
}
|
||||
|
||||
void ZeroVelocityXY()
|
||||
{
|
||||
vel .X = vel .Y = 0;
|
||||
}
|
||||
|
||||
void ZeroVelocity()
|
||||
{
|
||||
vel = { 0,0,0 };
|
||||
|
|
|
@ -2934,7 +2934,7 @@ static bool actKillModernDude(DBloodActor* actor, DAMAGE_TYPE damageType)
|
|||
actDropObject(actor, actor->xspr.dropMsg);
|
||||
|
||||
actor->spr.flags &= ~kPhysMove;
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
|
||||
playGenDudeSound(actor, kGenDudeSndTransforming);
|
||||
int seqId = actor->xspr.data2 + kGenDudeSeqTransform;
|
||||
|
@ -5162,7 +5162,7 @@ void MoveDude(DBloodActor* actor)
|
|||
actor->vel.Y += FixedToFloat(-mulscale16r(FloatToFixed(actor->vel.Y), nDrag));
|
||||
|
||||
if (actor->vel.XY().Length() < 0.0625)
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -5949,7 +5949,7 @@ static void actCheckDudes()
|
|||
// handle incarnations of custom dude
|
||||
if (actor->spr.type == kDudeModernCustom && actor->xspr.txID > 0 && actor->xspr.sysData1 == kGenDudeTransformStatus)
|
||||
{
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
if (seqGetStatus(actor) < 0) genDudeTransform(actor);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -217,7 +217,7 @@ void genDudeAttack1(int, DBloodActor* actor)
|
|||
if (actor->GetTarget() == nullptr) return;
|
||||
|
||||
DVector3 dv;
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
|
||||
GENDUDEEXTRA* pExtra = &actor->genDudeExtra;
|
||||
int dispersion = pExtra->baseDispersion;
|
||||
|
|
|
@ -1846,7 +1846,7 @@ void debrisMove(int listIndex)
|
|||
|
||||
actor->vel.XY() *= 1 - nDrag;
|
||||
if (actor->vel.XY().LengthSquared() < 1 / 256.)
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
@ -8154,7 +8154,7 @@ void aiPatrolMove(DBloodActor* actor)
|
|||
|
||||
if (abs(nAng) > goalAng || ((targetactor->xspr.waitTime > 0 || targetactor->xspr.data1 == targetactor->xspr.data2) && aiPatrolMarkerReached(actor)))
|
||||
{
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -2056,7 +2056,7 @@ static void flamethrowerflame(DDukeActor *actor)
|
|||
}
|
||||
|
||||
if (coll.type != 0) {
|
||||
actor->ZeroVelocityXY();
|
||||
actor->vel.XY().Zero();
|
||||
actor->vel.Z = 0;
|
||||
if (coll.type == kHitSprite)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue