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

- refactored 'mate' function for rxBucket.

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-01 19:57:38 +02:00
parent 1d04ce90e4
commit 0ef388538d
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4373,19 +4373,23 @@ spritetype* aiFightTargetIsPlayer(XSPRITE* pXSprite) {
return NULL;
}
spritetype* aiFightGetMateTargets(XSPRITE* pXSprite) {
int rx = pXSprite->rxID; spritetype* pMate = NULL; XSPRITE* pXMate = NULL;
spritetype* aiFightGetMateTargets(XSPRITE* pXSprite)
{
auto actor = &bloodActors[pXSprite->reference];
int rx = pXSprite->rxID;
for (int i = bucketHead[rx]; i < bucketHead[rx + 1]; i++) {
if (rxBucket[i].type == OBJ_SPRITE) {
pMate = &sprite[rxBucket[i].rxindex];
if (pMate->extra < 0 || pMate->index == sprite[pXSprite->reference].index || !IsDudeSprite(pMate))
for (int i = bucketHead[rx]; i < bucketHead[rx + 1]; i++)
{
if (rxBucket[i].type == OBJ_SPRITE)
{
auto mate = rxBucket[i].GetActor();
if (!mate || !mate->hasX() || mate == actor || !mate->IsDudeActor())
continue;
pXMate = &xsprite[pMate->extra];
if (pXMate->target_i > -1) {
if (!IsPlayerSprite(&sprite[pXMate->target_i]))
return &sprite[pXMate->target_i];
if (mate->GetTarget())
{
if (!mate->GetTarget()->IsPlayerActor())
return &mate->GetTarget()->s();
}
}
@ -4395,6 +4399,7 @@ spritetype* aiFightGetMateTargets(XSPRITE* pXSprite) {
}
bool aiFightMatesHaveSameTarget(XSPRITE* pXLeader, spritetype* pTarget, int allow) {
auto actor = &bloodActors[pXLeader->reference];
int rx = pXLeader->rxID; spritetype* pMate = NULL; XSPRITE* pXMate = NULL;
for (int i = bucketHead[rx]; i < bucketHead[rx + 1]; i++) {
@ -4402,12 +4407,11 @@ bool aiFightMatesHaveSameTarget(XSPRITE* pXLeader, spritetype* pTarget, int allo
if (rxBucket[i].type != OBJ_SPRITE)
continue;
pMate = &sprite[rxBucket[i].rxindex];
if (pMate->extra < 0 || pMate->index == sprite[pXLeader->reference].index || !IsDudeSprite(pMate))
continue;
auto mate = rxBucket[i].GetActor();
if (!mate || !mate->hasX() || mate == actor || !mate->IsDudeActor())
continue;
pXMate = &xsprite[pMate->extra];
if (pXMate->target_i == pTarget->index && allow-- <= 0)
if (&(mate->GetTarget()->s()) == pTarget && allow-- <= 0)
return true;
}