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

- got rid of the int aiSetTarget variant.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-29 12:30:51 +02:00
parent fbed29e6ca
commit 77d712dbc4
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/blood/src/ai.cpp
View file

@ -902,10 +902,10 @@ void aiActivateDude(DBloodActor* actor)
//
//---------------------------------------------------------------------------
void aiSetTarget(DBloodActor* actor, int x, int y, int z)
void aiSetTarget(DBloodActor* actor, const DVector3& pos)
{
actor->SetTarget(nullptr);
actor->xspr.TargetPos = {x * maptoworld, y * maptoworld, z * zmaptoworld };
actor->xspr.TargetPos = pos;
}
void aiSetTarget(DBloodActor* actor, DBloodActor* target)
@ -1850,7 +1850,7 @@ void aiInitSprite(DBloodActor* actor)
aiNewState(actor, &genIdle);
break;
}
aiSetTarget(actor, 0, 0, 0);
aiSetTarget(actor, DVector3(0, 0, 0));
actor->xspr.stateTimer = 0;
switch (actor->spr.type)
{

6
source/games/blood/src/ai.h
View file

@ -85,11 +85,7 @@ void aiMoveForward(DBloodActor*pXSprite);
void aiMoveTurn(DBloodActor*pXSprite);
void aiMoveDodge(DBloodActor *actor);
void aiActivateDude(DBloodActor *actor);
void aiSetTarget(DBloodActor* pXSprite, int x, int y, int z);
inline void aiSetTarget(DBloodActor* ac, const DVector3& pos)
{
aiSetTarget(ac, int(pos.X * worldtoint), int(pos.Y * worldtoint), int(pos.Z * zworldtoint));
}
void aiSetTarget(DBloodActor* ac, const DVector3& pos);
void aiSetTarget(DBloodActor* actor, DBloodActor* target);
int aiDamageSprite(DBloodActor* source, DBloodActor* actor, DAMAGE_TYPE nDmgType, int nDamage);
void aiThinkTarget(DBloodActor* actor);