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

Fix SE49 and SE50 breakage

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1885 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2011-05-14 02:00:21 +00:00
parent 19d65b699c
commit 682981b50e
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7835,11 +7835,10 @@ int32_t A_CheckEnemyTile(int32_t pn)
{ {
//this case can't be handled by the dynamictostatic system because it adds //this case can't be handled by the dynamictostatic system because it adds
//stuff to the value from names.h so handling separately //stuff to the value from names.h so handling separately
if ((pn >= GREENSLIME) && (pn <= GREENSLIME+7)) return 1; if (A_CheckSpriteTileFlags(pn, SPRITE_BADGUY) ||
ActorType[pn] ||
if (A_CheckSpriteTileFlags(pn,SPRITE_BADGUY)) return 1; (pn >= GREENSLIME && pn <= GREENSLIME+7))
return 1;
if (ActorType[pn]) return 1;
switch (DynamicTileMap[pn]) switch (DynamicTileMap[pn])
{ {
@ -7870,14 +7869,6 @@ int32_t A_CheckEnemyTile(int32_t pn)
case BOSS2__STATIC: case BOSS2__STATIC:
case BOSS3__STATIC: case BOSS3__STATIC:
case BOSS4__STATIC: case BOSS4__STATIC:
//case GREENSLIME:
//case GREENSLIME+1:
//case GREENSLIME+2:
//case GREENSLIME+3:
//case GREENSLIME+4:
//case GREENSLIME+5:
//case GREENSLIME+6:
//case GREENSLIME+7:
case RAT__STATIC: case RAT__STATIC:
case ROTATEGUN__STATIC: case ROTATEGUN__STATIC:
return 1; return 1;
@ -7977,7 +7968,7 @@ void G_MoveWorld(void)
{ {
spritetype *s = &sprite[i]; spritetype *s = &sprite[i];
if ((s->yrepeat < 4) || (sprite[i].picnum != SECTOREFFECTOR && (s->cstat & 32768)) || A_CheckSpriteFlags(i, SPRITE_NOLIGHT) || if ((sprite[i].picnum != SECTOREFFECTOR && ((s->cstat & 32768) || (s->yrepeat < 4))) || A_CheckSpriteFlags(i, SPRITE_NOLIGHT) ||
(A_CheckSpriteFlags(i, SPRITE_USEACTIVATOR) && sector[sprite[i].sectnum].lotag & 16384)) (A_CheckSpriteFlags(i, SPRITE_USEACTIVATOR) && sector[sprite[i].sectnum].lotag & 16384))
{ {
if (actor[i].lightptr != NULL) if (actor[i].lightptr != NULL)