zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- findNextMarker + markerIsNode

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-05 19:25:08 +02:00
parent a76f2feb63
commit f8a4ecc90f
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7710,22 +7710,22 @@ bool aiPatrolMarkerReached(DBloodActor* actor)
//
//---------------------------------------------------------------------------
int findNextMarker(XSPRITE* pXMark, bool back) {
XSPRITE* pXNext = NULL; int i;
for (i = headspritestat[kStatPathMarker]; i != -1; i = nextspritestat[i]) {
if (!xspriRangeIsFine(sprite[i].extra) || sprite[i].index == pXMark->reference)
continue;
DBloodActor* findNextMarker(DBloodActor* mark, bool back)
{
auto pXMark = &mark->x();
pXNext = &xsprite[sprite[i].extra];
BloodStatIterator it(kStatPathMarker);
while (auto next = it.Next())
{
if (!next->hasX() || next == mark) continue;
XSPRITE* pXNext = &next->x();
if ((pXNext->locked || pXNext->isTriggered || pXNext->DudeLockout) || (back && pXNext->data2 != pXMark->data1) || (!back && pXNext->data1 != pXMark->data2))
continue;
return sprite[i].index;
return next;
}
return -1;
return nullptr;
}
//---------------------------------------------------------------------------
@ -7734,14 +7734,18 @@ int findNextMarker(XSPRITE* pXMark, bool back) {
//
//---------------------------------------------------------------------------
bool markerIsNode(XSPRITE* pXMark, bool back) {
bool markerIsNode(DBloodActor* mark, bool back)
{
auto pXMark = &mark->x();
int cnt = 0;
XSPRITE* pXNext = NULL; int i; int cnt = 0;
for (i = headspritestat[kStatPathMarker]; i != -1; i = nextspritestat[i]) {
if (!xspriRangeIsFine(sprite[i].extra) || sprite[i].index == pXMark->reference)
continue;
BloodStatIterator it(kStatPathMarker);
while (auto next = it.Next())
{
if (!next->hasX() || next == mark) continue;
XSPRITE* pXNext = &next->x();
pXNext = &xsprite[sprite[i].extra];
if ((pXNext->locked || pXNext->isTriggered || pXNext->DudeLockout) || (back && pXNext->data2 != pXMark->data1) || (!back && pXNext->data1 != pXMark->data2))
continue;
@ -7805,7 +7809,7 @@ void aiPatrolSetMarker(spritetype* pSprite, XSPRITE* pXSprite) {
}
prev = pCur->index;
bool node = markerIsNode(pXCur, false);
bool node = markerIsNode(&bloodActors[pXSprite->target_i], false);
pXSprite->unused2 = aiPatrolGetPathDir(pXSprite, pXCur); // decide if it should go back or forward
if (pXSprite->unused2 == kPatrolMoveBackward && Chance(0x8000) && node)
pXSprite->unused2 = kPatrolMoveForward;
@ -8539,7 +8543,7 @@ void aiPatrolFlagsMgr(spritetype* pSource, XSPRITE* pXSource, spritetype* pDest,
bool aiPatrolGetPathDir(XSPRITE* pXSprite, XSPRITE* pXMarker) {
if (pXSprite->unused2 == kPatrolMoveForward) return (pXMarker->data2 == -2) ? (bool)kPatrolMoveBackward : (bool)kPatrolMoveForward;
else return (findNextMarker(pXMarker, kPatrolMoveBackward) >= 0) ? (bool)kPatrolMoveBackward : (bool)kPatrolMoveForward;
else return (findNextMarker(&bloodActors[pXMarker->reference], kPatrolMoveBackward) != nullptr) ? (bool)kPatrolMoveBackward : (bool)kPatrolMoveForward;
}