- floatified ghostThinkTarget

This commit is contained in:
Christoph Oelckers 2022-09-27 21:48:20 +02:00
parent babb45318f
commit d3e8db8861

View file

@ -180,21 +180,21 @@ static void ghostThinkTarget(DBloodActor* actor)
auto ppos = pPlayer->actor->spr.pos; auto ppos = pPlayer->actor->spr.pos;
auto dvect = ppos.XY() - actor->spr.pos; auto dvect = ppos.XY() - actor->spr.pos;
auto pSector = pPlayer->actor->sector(); auto pSector = pPlayer->actor->sector();
int nDist = approxDist(dvect); double nDist = dvect.Length();
if (nDist > pDudeInfo->seeDist && nDist > pDudeInfo->hearDist) if (nDist > pDudeInfo->SeeDist() && nDist > pDudeInfo->Heardist())
continue; continue;
double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE; double height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) * REPEAT_SCALE;
if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector())) if (!cansee(ppos, pSector, actor->spr.pos.plusZ(-height), actor->sector()))
continue; continue;
int nDeltaAngle = getincangle(actor->int_ang(), getangle(dvect)); DAngle nDeltaAngle = absangle(actor->spr.angle, VecToAngle(dvect));
if (nDist < pDudeInfo->seeDist && abs(nDeltaAngle) <= pDudeInfo->periphery) if (nDist < pDudeInfo->SeeDist() && nDeltaAngle <= pDudeInfo->Periphery())
{ {
pDudeExtraE->thinkTime = 0; pDudeExtraE->thinkTime = 0;
aiSetTarget(actor, pPlayer->actor); aiSetTarget(actor, pPlayer->actor);
aiActivateDude(actor); aiActivateDude(actor);
return; return;
} }
else if (nDist < pDudeInfo->hearDist) else if (nDist < pDudeInfo->Heardist())
{ {
pDudeExtraE->thinkTime = 0; pDudeExtraE->thinkTime = 0;
aiSetTarget(actor, ppos); aiSetTarget(actor, ppos);