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

- spritesTouching, readyForCrit

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-29 17:16:38 +02:00
parent 5ff17fec35
commit a1d01d5419
3 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1014,7 +1014,7 @@ int aiDamageSprite(DBloodActor* source, DBloodActor* actor, DAMAGE_TYPE nDmgType
PLAYER* pPlayer = getPlayerById(pSource->type);
if (!pPlayer) return nDamage;
if (powerupCheck(pPlayer, kPwUpShadowCloak)) pPlayer->pwUpTime[kPwUpShadowCloak] = 0;
if (readyForCrit(pSource, pSprite))
if (readyForCrit(source, actor))
{
nDamage += aiDamageSprite(actor, source, nDmgType, nDamage * (10 - gGameOptions.nDifficulty));
if (pXSprite->health > 0)

50
source/games/blood/src/nnexts.cpp
View file

@ -8149,20 +8149,33 @@ void aiPatrolAlarmFull(DBloodActor* actor, DBloodActor* targetactor, bool chain)
}
}
bool spritesTouching(int nXSprite1, int nXSprite2) {
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
if (!xspriRangeIsFine(nXSprite1) || !xspriRangeIsFine(nXSprite2))
bool spritesTouching(DBloodActor *actor1, DBloodActor* actor2)
{
if (!actor1->hasX() || !actor2->hasX())
return false;
auto hit = &actor1->hit();
DBloodActor* hitactor = nullptr;
if (gSpriteHit[nXSprite1].hit.type == kHitSprite) hitactor = gSpriteHit[nXSprite1].hit.actor;
else if (gSpriteHit[nXSprite1].florhit.type == kHitSprite) hitactor = gSpriteHit[nXSprite1].florhit.actor;
else if (gSpriteHit[nXSprite1].ceilhit.type == kHitSprite) hitactor = gSpriteHit[nXSprite1].ceilhit.actor;
if (hit->hit.type == kHitSprite) hitactor = hit->hit.actor;
else if (hit->florhit.type == kHitSprite) hitactor = hit->florhit.actor;
else if (hit->ceilhit.type == kHitSprite) hitactor = hit->ceilhit.actor;
else return false;
return hitactor->hasX() && hitactor->s().extra == nXSprite2;
return hitactor->hasX() && hitactor == actor2;
}
bool aiCanCrouch(DBloodActor* actor)
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
bool aiCanCrouch(DBloodActor* actor)
{
auto pSprite = &actor->s();
if (pSprite->type >= kDudeBase && pSprite->type < kDudeVanillaMax)
@ -8174,9 +8187,16 @@ bool aiCanCrouch(DBloodActor* actor)
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
bool readyForCrit(spritetype* pHunter, spritetype* pVictim) {
bool readyForCrit(DBloodActor* hunter, DBloodActor* victim)
{
auto pHunter = &hunter->s();
auto pVictim = &victim->s();
if (!(pHunter->type >= kDudeBase && pHunter->type < kDudeMax) || !(pVictim->type >= kDudeBase && pVictim->type < kDudeMax))
return false;
@ -8189,10 +8209,15 @@ bool readyForCrit(spritetype* pHunter, spritetype* pVictim) {
return (abs(((getangle(dx, dy) + 1024 - pVictim->ang) & 2047) - 1024) <= kAng45);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int aiPatrolSearchTargets(spritetype* pSprite, XSPRITE* pXSprite) {
auto actor = &bloodActors[pSprite->index];
enum { kMaxPatrolFoundSounds = 256 }; // should be the maximum amount of sound channels the engine can play at the same time.
PATROL_FOUND_SOUNDS patrolBonkles[kMaxPatrolFoundSounds];
@ -8241,13 +8266,12 @@ int aiPatrolSearchTargets(spritetype* pSprite, XSPRITE* pXSprite) {
}
bool invisible = (powerupCheck(pPlayer, kPwUpShadowCloak) > 0);
if (spritesTouching(pSprite->extra, pSpr->extra) || spritesTouching(pSpr->extra, pSprite->extra)) {
if (spritesTouching(actor, pPlayer->actor()) || spritesTouching(pPlayer->actor(), actor))
{
DPrintf(DMSG_SPAMMY, "Patrol dude #%d spot the Player #%d via touch.", pSprite->index, pPlayer->nPlayer + 1);
if (invisible) pPlayer->pwUpTime[kPwUpShadowCloak] = 0;
target = pSpr->index;
break;
}
if (!deaf) {

2
source/games/blood/src/nnexts.h
View file

@ -425,7 +425,7 @@ inline bool aiInPatrolState(int nAiStateType) {
return (nAiStateType >= kAiStatePatrolBase && nAiStateType < kAiStatePatrolMax);
}
// ------------------------------------------------------------------------- //
bool readyForCrit(spritetype* pHunter, spritetype* pVictim);
bool readyForCrit(DBloodActor* pHunter, DBloodActor* pVictim);
int sectorInMotion(int nSector);
void clampSprite(spritetype* pSprite, int which = 0x03);
#endif