zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 04:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove viewSetSystemMessage() when setting dude flags via command

Browse source 
# Conflicts:
#	source/blood/src/nnexts.cpp
This commit is contained in:
NoOneBlood 2021-01-09 01:45:09 +03:00 committed by Christoph Oelckers
parent 86082d4c10
commit 73683b3ebe
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4342,7 +4342,7 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
break;
case kCmdDudeFlagsSet:
if (xspriRangeIsFine(sprite[event.index].extra)) {
if (!xsprite[sprite[event.index].extra].dudeFlag4) {
if (!pXSprite->dudeFlag4) {
if (pXSprite->aiState->stateType < kAiStatePatrolBase || pXSprite->aiState->stateType >= kAiStatePatrolMax) break;
else aiPatrolStop(pSprite, -1);
@ -4353,10 +4353,12 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
else if (spriteIsUnderwater(pSprite)) aiPatrolState(pSprite, kAiStatePatrolWaitW);
else aiPatrolState(pSprite, kAiStatePatrolWaitL);
viewSetSystemMessage("%d", pXSprite->aiState->stateType);
pXSprite->data3 = 0;
}
//viewSetSystemMessage("%d / %d / %d", pSprite->type, pXSprite->dudeFlag4, pXSprite->dudeGuard);
}
break;
default:
@ -6353,7 +6355,7 @@ int aiPatrolSearchTargets(spritetype* pSprite, XSPRITE* pXSprite) {
continue;
XSPRITE* pXSpr = &xsprite[pSpr->extra];
if (pSprite->owner == pSpr->index || pXSpr->health == 0)
if (pSprite->index == pSpr->index || pSprite->owner == pSpr->index || pXSpr->health == 0)
continue;
x = pSpr->x;