zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made patrolBonkles local to the only function using this array.

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-27 13:41:58 +02:00
parent 71b144023d
commit b64aede68e
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,9 +38,6 @@ BEGIN_BLD_NS
inline int mulscale8(int a, int b) { return MulScale(a, b, 8); } inline int mulscale8(int a, int b) { return MulScale(a, b, 8); }
enum { kMaxPatrolFoundSounds = 256 }; // should be the maximum amount of sound channels the engine can play at the same time.
PATROL_FOUND_SOUNDS patrolBonkles[kMaxPatrolFoundSounds];
bool gAllowTrueRandom = false; bool gAllowTrueRandom = false;
bool gEventRedirectsUsed = false; bool gEventRedirectsUsed = false;
DBloodActor* gProxySpritesList[]; // list of additional sprites which can be triggered by Proximity DBloodActor* gProxySpritesList[]; // list of additional sprites which can be triggered by Proximity
@ -255,15 +252,6 @@ CONDITION_TYPE_NAMES gCondTypeNames[7] = {
}; };
void nnExResetPatrolBonkles() {
for (int i = 0; i < kMaxPatrolFoundSounds; i++) {
patrolBonkles[i].snd = patrolBonkles[i].cur = 0;
patrolBonkles[i].max = ClipLow((gGameOptions.nDifficulty + 1) >> 1, 1);
}
}
// for actor.cpp // for actor.cpp
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@ -7143,10 +7131,17 @@ bool readyForCrit(spritetype* pHunter, spritetype* pVictim) {
int aiPatrolSearchTargets(spritetype* pSprite, XSPRITE* pXSprite) { int aiPatrolSearchTargets(spritetype* pSprite, XSPRITE* pXSprite) {
enum { kMaxPatrolFoundSounds = 256 }; // should be the maximum amount of sound channels the engine can play at the same time.
PATROL_FOUND_SOUNDS patrolBonkles[kMaxPatrolFoundSounds];
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax); assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
DUDEINFO* pDudeInfo = getDudeInfo(pSprite->type); PLAYER* pPlayer = NULL; DUDEINFO* pDudeInfo = getDudeInfo(pSprite->type); PLAYER* pPlayer = NULL;
nnExResetPatrolBonkles(); for (int i = 0; i < kMaxPatrolFoundSounds; i++) {
patrolBonkles[i].snd = patrolBonkles[i].cur = 0;
patrolBonkles[i].max = ClipLow((gGameOptions.nDifficulty + 1) >> 1, 1);
}
int i, j, f, mod, x, y, z, dx, dy, nDist, eyeAboveZ, target = -1, sndCnt = 0, seeDist, hearDist, feelDist, seeChance, hearChance; int i, j, f, mod, x, y, z, dx, dy, nDist, eyeAboveZ, target = -1, sndCnt = 0, seeDist, hearDist, feelDist, seeChance, hearChance;
bool stealth = (pXSprite->unused1 & kDudeFlagStealth); bool blind = (pXSprite->dudeGuard); bool deaf = (pXSprite->dudeDeaf); bool stealth = (pXSprite->unused1 & kDudeFlagStealth); bool blind = (pXSprite->dudeGuard); bool deaf = (pXSprite->dudeDeaf);