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

- Blood: Floatified batThinkChase().

Browse source
This commit is contained in:
Mitchell Richters 2022-09-24 23:05:27 +10:00 committed by Christoph Oelckers
parent 761412313f
commit ad8fbc51de
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/games/blood/src/aibat.cpp
View file

@ -256,26 +256,29 @@ static void batThinkChase(DBloodActor* actor)
aiNewState(actor, &batSearch); aiNewState(actor, &batSearch);
return; return;
} }
int nDist = approxDist(dvec); double nDist = dvec.Length();
if (nDist <= pDudeInfo->seeDist) if (nDist <= (pDudeInfo->seeDist * inttoworld))
{ {
int nDeltaAngle = getincangle(actor->int_ang(), getangle(dvec)); DAngle nDeltaAngle = deltaangle(actor->spr.angle, dvec.Angle());
int height = (pDudeInfo->eyeHeight * actor->spr.yrepeat) << 2; double height = pDudeInfo->eyeHeight * actor->spr.yrepeat * REPEAT_SCALE;
// Should be dudeInfo[pTarget->spr.type-kDudeBase] // Should be dudeInfo[pTarget->spr.type-kDudeBase]
int height2 = (pDudeInfo->eyeHeight * pTarget->spr.yrepeat) << 2; double height2 = pDudeInfo->eyeHeight * pTarget->spr.yrepeat * REPEAT_SCALE;
int top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);
if (cansee(pTarget->spr.pos, pTarget->sector(), actor->spr.pos.plusZ(-height * zinttoworld), actor->sector())) if (cansee(pTarget->spr.pos, pTarget->sector(), actor->spr.pos.plusZ(-height), actor->sector()))
{ {
if (nDist < pDudeInfo->seeDist && abs(nDeltaAngle) <= pDudeInfo->periphery) if (nDist < (pDudeInfo->seeDist * inttoworld) && abs(nDeltaAngle).Buildang() <= pDudeInfo->periphery)
{ {
aiSetTarget(actor, actor->GetTarget()); aiSetTarget(actor, actor->GetTarget());
int floorZ = getflorzofslopeptr(actor->sector(), actor->spr.pos); double floorZ = getflorzofslopeptrf(actor->sector(), actor->spr.pos);
if (height2 - height < 0x2000 && nDist < 0x200 && abs(nDeltaAngle) < 85) double floorDelta = floorZ - bottom;
double heightDelta = height2 - height;
bool angWithinRange = abs(nDeltaAngle) < mapangle(85);
if (heightDelta < 32 && nDist < 0x20 && angWithinRange)
aiNewState(actor, &batBite); aiNewState(actor, &batBite);
else if ((height2 - height > 0x5000 || floorZ - bottom > 0x5000) && nDist < 0x1400 && nDist > 0x800 && abs(nDeltaAngle) < 85) else if ((heightDelta > 80 || floorDelta > 80) && nDist < 0x140 && nDist > 0x80 && angWithinRange)
aiNewState(actor, &batSwoop); aiNewState(actor, &batSwoop);
else if ((height2 - height < 0x3000 || floorZ - bottom < 0x3000) && abs(nDeltaAngle) < 85) else if ((heightDelta < 48 || floorDelta < 48) && angWithinRange)
aiNewState(actor, &batFly); aiNewState(actor, &batFly);
return; return;
} }