- the rest.

This commit is contained in:
Christoph Oelckers 2022-09-01 17:14:48 +02:00
parent 567b20f9ef
commit 9600face4a
12 changed files with 16 additions and 16 deletions

View file

@ -1718,7 +1718,7 @@ void recon(DDukeActor *actor, int explosion, int firelaser, int attacksnd, int p
if (l <= 1524)
{
a = actor->int_ang();
actor->spr.xvel >>= 1;
actor->mul_int_xvel(0.5);
}
else a = getangle(Owner->spr.pos.XY() - actor->spr.pos.XY());

View file

@ -2634,7 +2634,7 @@ static void heavyhbomb(DDukeActor *actor)
if(actor->float_xvel() < 0)
actor->clear_xvel();
if (actor->spr.xvel & 8) actor->spr.cstat ^= CSTAT_SPRITE_XFLIP;
if (int(actor->float_xvel() * 16) & 8) actor->spr.cstat ^= CSTAT_SPRITE_XFLIP;
}
if (coll.type== kHitWall)
@ -2645,7 +2645,7 @@ static void heavyhbomb(DDukeActor *actor)
int k = getangle(wal->delta());
actor->set_int_ang(((k << 1) - actor->int_ang()) & 2047);
actor->spr.xvel >>= 1;
actor->mul_int_xvel(0.5);
}
DETONATEB:

View file

@ -2422,7 +2422,7 @@ static void heavyhbomb(DDukeActor *actor)
if(actor->float_xvel() < 0)
actor->clear_xvel();
if (actor->spr.xvel & 8) actor->spr.cstat ^= CSTAT_SPRITE_XFLIP;
if (int(actor->float_xvel() * 16) & 8) actor->spr.cstat ^= CSTAT_SPRITE_XFLIP;
}
if (coll.type == kHitWall)

View file

@ -364,7 +364,7 @@ void AILion::Tick(RunListEvent* ev)
if (nMov.exbits & kHitAux2)
{
pActor->spr.xvel >>= 1;
pActor->mul_int_xvel(0.5);
pActor->spr.yvel >>= 1;
}

View file

@ -1320,7 +1320,7 @@ DExhumedActor* BuildCreatureChunk(DExhumedActor* pSrc, int nPic, bool bSpecial)
if (bSpecial)
{
pActor->spr.xvel *= 4;
pActor->mul_int_xvel(4);
pActor->spr.yvel *= 4;
pActor->mul_int_zvel(2);
}
@ -1379,7 +1379,7 @@ void AICreatureChunk::Tick(RunListEvent* ev)
{
if (nVal.exbits & kHitAux1)
{
pActor->spr.xvel >>= 1;
pActor->mul_int_xvel(0.5);
pActor->spr.yvel >>= 1;
pActor->set_int_zvel(-pActor->int_zvel());
return;

View file

@ -373,7 +373,7 @@ void AIMummy::Tick(RunListEvent* ev)
{
if (nMov.exbits)
{
pActor->spr.xvel >>= 1;
pActor->mul_int_xvel(0.5);
pActor->spr.yvel >>= 1;
}

View file

@ -2037,7 +2037,7 @@ void AIObject::RadialDamage(RunListEvent* ev)
}
else if (pActor->spr.statnum != kStatAnubisDrum)
{
pActor->spr.xvel >>= 1;
pActor->mul_int_xvel(0.5);
pActor->spr.yvel >>= 1;
pActor->mul_int_zvel(0.5);
}

View file

@ -969,7 +969,7 @@ void AIPlayer::Tick(RunListEvent* ev)
if (zVel >= 6500)
{
pPlayerActor->spr.xvel >>= 2;
pPlayerActor->mul_int_xvel(0.25);
pPlayerActor->spr.yvel >>= 2;
runlist_DamageEnemy(pPlayerActor, nullptr, ((zVel - 6500) >> 7) + 10);

View file

@ -394,7 +394,7 @@ void AISet::Tick(RunListEvent* ev)
if (pActor->nIndex2)
{
pActor->spr.xvel *= 2;
pActor->mul_int_xvel(2);
pActor->spr.yvel *= 2;
}
@ -546,7 +546,7 @@ void AISet::Tick(RunListEvent* ev)
case 9:
{
pActor->spr.xvel >>= 1;
pActor->mul_int_xvel(0.5);
pActor->spr.yvel >>= 1;
if (bVal)

View file

@ -125,7 +125,7 @@ int DoActorDie(DSWActor* actor, DSWActor* weapActor, int meansofdeath)
case COOLIE_RUN_R0:
ChangeState(actor, actor->user.StateEnd);
actor->user.RotNum = 0;
actor->spr.xvel <<= 1;
actor->mul_int_xvel(2);
actor->user.ActorActionFunc = nullptr;
actor->spr.angle += DAngle180;
break;
@ -199,7 +199,7 @@ int DoActorDie(DSWActor* actor, DSWActor* weapActor, int meansofdeath)
// Rippers still gotta jump or they fall off walls weird
if (actor->user.ID == RIPPER_RUN_R0 || actor->user.ID == RIPPER2_RUN_R0)
{
actor->spr.xvel <<= 1;
actor->mul_int_xvel(2);
actor->user.jump_speed = -100 - RandomRange(250);
DoActorBeginJump(actor);
}

View file

@ -3186,7 +3186,7 @@ bool ActorTrackDecide(TRACK_POINT* tpoint, DSWActor* actor)
if (actor->user.ActorActionSet->DeathJump)
{
actor->user.Flags |= (SPR_DEAD);
actor->spr.xvel <<= 1;
actor->mul_int_xvel(2);
actor->user.jump_speed = -495;
DoActorBeginJump(actor);
NewStateGroup(actor, actor->user.ActorActionSet->DeathJump);

View file

@ -3910,7 +3910,7 @@ int DoShrapDamage(DSWActor* actor)
{
actor->user.Flags |= (SPR_BOUNCE);
actor->user.jump_speed = -300;
actor->spr.xvel >>= 2;
actor->mul_int_xvel(0.25);
DoBeginJump(actor);
return 0;
}