zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 11:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified zombfThinkChase

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-27 23:08:11 +02:00
parent 5ba2eb4f64
commit 769565997f
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/games/blood/src/aizombf.cpp
View file

@ -111,9 +111,9 @@ static void zombfThinkChase(DBloodActor* actor)
if (!actor->ValidateTarget(__FUNCTION__)) return; if (!actor->ValidateTarget(__FUNCTION__)) return;
auto target = actor->GetTarget(); auto target = actor->GetTarget();
int dx = target->int_pos().X - actor->int_pos().X; auto dv = target->spr.pos - actor->spr.pos;
int dy = target->int_pos().Y - actor->int_pos().Y; auto nAngle = VecToAngle(dv);
aiChooseDirection(actor, VecToAngle(dx, dy)); aiChooseDirection(actor, nAngle);
if (target->xspr.health == 0) if (target->xspr.health == 0)
{ {
aiNewState(actor, &zombieFSearch); aiNewState(actor, &zombieFSearch);
@ -124,19 +124,19 @@ static void zombfThinkChase(DBloodActor* actor)
aiNewState(actor, &zombieFSearch); aiNewState(actor, &zombieFSearch);
return; return;
} }
int nDist = approxDist(dx, dy); double nDist = dv.Length();
if (nDist <= pDudeInfo->seeDist) if (nDist <= pDudeInfo->SeeDist())
{ {
int nDeltaAngle = getincangle(actor->int_ang(), getangle(dx, dy)); DAngle nDeltaAngle = absangle(actor->spr.angle, nAngle);
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE; double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector())) if (cansee(target->spr.pos, target->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{ {
if (abs(nDeltaAngle) <= pDudeInfo->periphery) if (nDeltaAngle <= pDudeInfo->Periphery())
{ {
aiSetTarget(actor, actor->GetTarget()); aiSetTarget(actor, actor->GetTarget());
if (nDist < 0x1400 && nDist > 0xe00 && abs(nDeltaAngle) < 85) if (nDist < 0x100 && nDist > 0xe0 && abs(nDeltaAngle) < DAngle15)
{ {
int hit = HitScan_(actor, actor->spr.pos.Z, dx, dy, 0, CLIPMASK1, 0); int hit = HitScan(actor, actor->spr.pos.Z, DVector3(dv, 0), CLIPMASK1, 0);
switch (hit) switch (hit)
{ {
case -1: case -1:
@ -153,9 +153,9 @@ static void zombfThinkChase(DBloodActor* actor)
break; break;
} }
} }
else if (nDist < 0x1400 && nDist > 0x600 && abs(nDeltaAngle) < 85) else if (nDist < 0x140 && nDist > 0x60 && nDeltaAngle < DAngle15)
{ {
int hit = HitScan_(actor, actor->spr.pos.Z, dx, dy, 0, CLIPMASK1, 0); int hit = HitScan(actor, actor->spr.pos.Z, DVector3(dv, 0), CLIPMASK1, 0);
switch (hit) switch (hit)
{ {
case -1: case -1:
@ -172,9 +172,9 @@ static void zombfThinkChase(DBloodActor* actor)
break; break;
} }
} }
else if (nDist < 0x400 && abs(nDeltaAngle) < 85) else if (nDist < 0x40 && nDeltaAngle < DAngle15)
{ {
int hit = HitScan_(actor, actor->spr.pos.Z, dx, dy, 0, CLIPMASK1, 0); int hit = HitScan(actor, actor->spr.pos.Z, DVector3(dv, 0), CLIPMASK1, 0);
switch (hit) switch (hit)
{ {
case -1: case -1: