zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified VectorWormSeek

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 22:52:08 +02:00
parent 07f2039095
commit 8a23a5d16b
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/games/sw/src/weapon.cpp
View file

@ -7795,9 +7795,6 @@ int VectorMissileSeek(DSWActor* actor, int16_t delay_tics, int16_t turn_speed, i
// completely vector manipulation // completely vector manipulation
int VectorWormSeek(DSWActor* actor, int16_t delay_tics, int16_t aware_range1, int16_t aware_range2) int VectorWormSeek(DSWActor* actor, int16_t delay_tics, int16_t aware_range1, int16_t aware_range2)
{ {
int dist;
int zh;
if (actor->user.WaitTics <= delay_tics) if (actor->user.WaitTics <= delay_tics)
actor->user.WaitTics += MISSILEMOVETICS; actor->user.WaitTics += MISSILEMOVETICS;
@ -7824,19 +7821,14 @@ int VectorWormSeek(DSWActor* actor, int16_t delay_tics, int16_t aware_range1, in
DSWActor* goal = actor->user.WpnGoalActor; DSWActor* goal = actor->user.WpnGoalActor;
if (goal != nullptr) if (goal != nullptr)
{ {
int ox,oy,oz; auto delta = (goal->spr.pos.XY() - actor->spr.pos.XY());
double zdiff = ActorZOfTop(goal) + (ActorSizeZ(goal) * 0.25) - actor->spr.pos.Z;
zh = int_ActorZOfTop(actor) + (int_ActorSizeZ(actor) >> 2); double dist = g_sqrt(delta.LengthSquared() + zdiff * zdiff);
dist = ksqrt(SQ(actor->int_pos().X - goal->int_pos().X) + SQ(actor->int_pos().Y - goal->int_pos().Y) + (SQ(actor->int_pos().Z - zh)>>8));
auto oc = actor->user.change; auto oc = actor->user.change;
actor->user.set_int_change_x(Scale(actor->spr.xvel, goal->int_pos().X - actor->int_pos().X, dist)); auto vel = (actor->spr.xvel * zinttoworld) / dist;
actor->user.set_int_change_y(Scale(actor->spr.xvel, goal->int_pos().Y - actor->int_pos().Y, dist)); actor->user.change = DVector3(delta, zdiff) * vel + oc * (7. / 8);
actor->user.set_int_change_z(Scale(actor->spr.xvel, zh - actor->int_pos().Z, dist));
actor->user.change += oc * (7./8);
SetAngleFromChange(actor); SetAngleFromChange(actor);
} }