teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-21 00:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Z velocity in MoveMissile

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-16 18:11:58 +02:00
parent c76540664d
commit 305bca68c0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/blood/src/actor.cpp
View file

@ -5225,7 +5225,7 @@ int MoveMissile(DBloodActor* actor)
gHitInfo.clearObj(); gHitInfo.clearObj();
if (actor->spr.type == kMissileFlameSpray) actAirDrag(actor, 0x1000); if (actor->spr.type == kMissileFlameSpray) actAirDrag(actor, 0x1000);
if (actor->GetTarget() != nullptr && (actor->vel.X != 0 || actor->vel.Y != 0 || actor->int_vel().Z)) if (actor->GetTarget() != nullptr && !actor->vel.isZero())
{ {
auto target = actor->GetTarget(); auto target = actor->GetTarget();
@ -5236,11 +5236,10 @@ int MoveMissile(DBloodActor* actor)
auto rpt = rotatepoint(DVector2(0,0), DVector2(vx, 0), DAngle::fromBuild(getangle(target->spr.pos - actor->spr.pos))); auto rpt = rotatepoint(DVector2(0,0), DVector2(vx, 0), DAngle::fromBuild(getangle(target->spr.pos - actor->spr.pos)));
actor->set_int_bvel_x(rpt.X); // we were rotating an int vector here so scale matches. actor->set_int_bvel_x(rpt.X); // we were rotating an int vector here so scale matches.
actor->set_int_bvel_y(rpt.Y); actor->set_int_bvel_y(rpt.Y);
int dz = target->int_pos().Z - actor->int_pos().Z; double deltaz = (target->spr.pos.Z - actor->spr.pos.Z) / (10 * 256);
int deltaz = dz / 10; if (target->spr.pos.Z < actor->spr.pos.Z) deltaz = -deltaz;
if (target->int_pos().Z < actor->int_pos().Z) deltaz = -deltaz; actor->vel.Z += deltaz;
actor->add_int_bvel_z(deltaz);
} }
} }
auto vel = actor->vel; auto vel = actor->vel;