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

Tweak r3681 to obtain the same behavior in the pre-r3681 undefined behavior case.

Browse source 
That is, assume that switch(DYNAMICTILEMAP(-1)) (which is an oob access and thus
undefined behavior) gets us to the 'default:' label.

git-svn-id: https://svn.eduke32.com/eduke32@3743 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-05-10 12:31:33 +00:00
parent e627f09787
commit 8dd73d0fe8
2 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1977,31 +1977,33 @@ ACTOR_STATIC void G_MoveStandables(void)
t[1] = s->ang; t[1] = s->ang;
k = A_IncurDamage(i); k = A_IncurDamage(i);
if (k < 0)
goto crack_default;
if (k >= 0) switch (DYNAMICTILEMAP(k))
switch (DYNAMICTILEMAP(k)) {
case FIREEXT__STATIC:
case RPG__STATIC:
case RADIUSEXPLOSION__STATIC:
case SEENINE__STATIC:
case OOZFILTER__STATIC:
for (SPRITES_OF(STAT_STANDABLE, j))
{ {
case FIREEXT__STATIC: if (s->hitag == sprite[j].hitag && (sprite[j].picnum == OOZFILTER || sprite[j].picnum == SEENINE))
case RPG__STATIC: if (sprite[j].shade != -32)
case RADIUSEXPLOSION__STATIC: sprite[j].shade = -32;
case SEENINE__STATIC:
case OOZFILTER__STATIC:
for (SPRITES_OF(STAT_STANDABLE, j))
{
if (s->hitag == sprite[j].hitag && (sprite[j].picnum == OOZFILTER || sprite[j].picnum == SEENINE))
if (sprite[j].shade != -32)
sprite[j].shade = -32;
}
goto DETONATE;
default:
s->cstat = t[0];
s->ang = t[1];
s->extra = 0;
goto BOLT;
} }
goto DETONATE;
crack_default:
default:
s->cstat = t[0];
s->ang = t[1];
s->extra = 0;
goto BOLT;
}
} }
goto BOLT; goto BOLT;
} }

4
polymer/eduke32/source/actors.h
View file

@ -224,8 +224,8 @@ enum sflags_t {
SPRITE_DIDNOSE7WATER = 0x00080000, // used temporarily SPRITE_DIDNOSE7WATER = 0x00080000, // used temporarily
}; };
// custom projectiles // Custom projectiles "workslike" flags.
// KEEPINSYNC lunatic/con_lang.lua // XXX: Currently not predefined from CON.
enum pflags_t { enum pflags_t {
PROJECTILE_HITSCAN = 0x00000001, PROJECTILE_HITSCAN = 0x00000001,
PROJECTILE_RPG = 0x00000002, PROJECTILE_RPG = 0x00000002,