teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added format conversion helpers to DUDEINFO.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-16 23:04:46 +02:00
parent b2d1988e50
commit d7a93e140c
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,7 +139,7 @@ static void batThinkGoto(DBloodActor* actor)
auto nAngle = VecToAngle(dvec);
int nDist = approxDist(dvec);
aiChooseDirection(actor, nAngle);
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < mapangle(pDudeInfo->periphery))
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < pDudeInfo->Periphery())
aiNewState(actor, &batSearch);
batThinkTarget(actor);
}

4
source/games/blood/src/aibeast.cpp
View file

@ -178,7 +178,7 @@ static void beastThinkGoto(DBloodActor* actor)
auto nAngle = VecToAngle(dvec);
int nDist = approxDist(dvec);
aiChooseDirection(actor, nAngle);
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < mapangle(pDudeInfo->periphery))
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < pDudeInfo->Periphery())
{
if (pXSector && pXSector->Underwater)
aiNewState(actor, &beastSwimSearch);
@ -328,7 +328,7 @@ static void beastThinkSwimGoto(DBloodActor* actor)
auto nAngle = VecToAngle(dvec);
int nDist = approxDist(dvec);
aiChooseDirection(actor, nAngle);
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < mapangle(pDudeInfo->periphery))
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < pDudeInfo->Periphery())
aiNewState(actor, &beastSwimSearch);
aiThinkTarget(actor);
}

2
source/games/blood/src/aiboneel.cpp
View file

@ -152,7 +152,7 @@ static void eelThinkGoto(DBloodActor* actor)
auto nAngle = VecToAngle(dvec);
int nDist = approxDist(dvec);
aiChooseDirection(actor, nAngle);
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < mapangle(pDudeInfo->periphery))
if (nDist < 512 && absangle(actor->spr.angle, nAngle) < pDudeInfo->Periphery())
aiNewState(actor, &eelSearch);
eelThinkTarget(actor);
}

16
source/games/blood/src/dude.h
View file

@ -52,6 +52,22 @@ struct DUDEINFO {
int damageVal[7]; // real damage? Hmm?
int at8c; // unused ?
int at90; // unused ?
// converters to floating point format
inline double Heardist() const
{
return hearDist * maptoworld;
}
inline double SeeDist() const
{
return seeDist * maptoworld;
}
inline DAngle Periphery() const
{
return mapangle(periphery);
}
};
extern DUDEINFO dudeInfo[kDudeMax - kDudeBase];