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

Fixes an issue with enemies waking up when using security cameras

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5932 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-11-14 23:47:06 +00:00
parent d9f3d4410c
commit 55532bb571
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
polymer/eduke32/source/actors.c
View file

@ -886,26 +886,26 @@ ACTOR_STATIC void G_MoveZombieActors(void)
while (spriteNum >= 0) while (spriteNum >= 0)
{ {
int const nextSprite = nextspritestat[spriteNum]; int const nextSprite = nextspritestat[spriteNum];
int32_t playerDist; int32_t playerDist;
spritetype *const pSprite = &sprite[spriteNum]; spritetype *const pSprite = &sprite[spriteNum];
int const playerNum = A_FindPlayer(pSprite, &playerDist); int const playerNum = A_FindPlayer(pSprite, &playerDist);
DukePlayer_t *const pPlayer = g_player[playerNum].ps;
if (sprite[g_player[playerNum].ps->i].extra > 0) if (sprite[pPlayer->i].extra > 0)
{ {
if (playerDist < 30000) if (playerDist < 30000)
{ {
actor[spriteNum].timetosleep++; actor[spriteNum].timetosleep++;
if (actor[spriteNum].timetosleep >= (playerDist>>8)) if (actor[spriteNum].timetosleep >= (playerDist>>8))
{ {
if (A_CheckEnemySprite(pSprite)) if (pPlayer->newowner == -1 && A_CheckEnemySprite(pSprite))
{ {
vec3_t const p = { g_player[playerNum].ps->pos.x + 64 - (krand() & 127), vec3_t const p = { pPlayer->pos.x + 64 - (krand() & 127),
g_player[playerNum].ps->pos.y + 64 - (krand() & 127), pPlayer->pos.y + 64 - (krand() & 127),
g_player[playerNum].ps->pos.z - (krand() % ZOFFSET5) pPlayer->pos.z - (krand() % ZOFFSET5) };
};
int16_t pSectnum = g_player[playerNum].ps->cursectnum; int16_t pSectnum = pPlayer->cursectnum;
updatesector(p.x, p.y, &pSectnum); updatesector(p.x, p.y, &pSectnum);
@ -932,8 +932,8 @@ ACTOR_STATIC void G_MoveZombieActors(void)
j = cansee(s.x, s.y, s.z, sectNum, p.x, p.y, p.z, pSectnum); j = cansee(s.x, s.y, s.z, sectNum, p.x, p.y, p.z, pSectnum);
} }
else else
j = cansee(pSprite->x, pSprite->y, pSprite->z - ((krand() & 31) << 8), pSprite->sectnum, g_player[playerNum].ps->pos.x, j = cansee(pSprite->x, pSprite->y, pSprite->z - ((krand() & 31) << 8), pSprite->sectnum, pPlayer->opos.x,
g_player[playerNum].ps->pos.y, g_player[playerNum].ps->pos.z - ((krand() & 31) << 8), g_player[playerNum].ps->cursectnum); pPlayer->opos.y, pPlayer->opos.z - ((krand() & 31) << 8), pPlayer->cursectnum);
if (j) if (j)
{ {
@ -953,7 +953,7 @@ ACTOR_STATIC void G_MoveZombieActors(void)
case NUKEBARRELDENTED__STATIC: case NUKEBARRELDENTED__STATIC:
case NUKEBARRELLEAKED__STATIC: case NUKEBARRELLEAKED__STATIC:
case TRIPBOMB__STATIC: case TRIPBOMB__STATIC:
pSprite->shade = (sector[pSprite->sectnum].ceilingstat & 1 && A_CheckSpriteFlags(spriteNum, SFLAG_NOSHADE) == 0) pSprite->shade = ((sector[pSprite->sectnum].ceilingstat & 1) && A_CheckSpriteFlags(spriteNum, SFLAG_NOSHADE) == 0)
? sector[pSprite->sectnum].ceilingshade ? sector[pSprite->sectnum].ceilingshade
: sector[pSprite->sectnum].floorshade; : sector[pSprite->sectnum].floorshade;
actor[spriteNum].timetosleep = 0; actor[spriteNum].timetosleep = 0;