mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Tweak r3681 to obtain the same behavior in the pre-r3681 undefined behavior case.
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:
parent
e627f09787
commit
8dd73d0fe8
2 changed files with 26 additions and 24 deletions
|
@ -1977,8 +1977,9 @@ ACTOR_STATIC void G_MoveStandables(void)
|
|||
t[1] = s->ang;
|
||||
|
||||
k = A_IncurDamage(i);
|
||||
if (k < 0)
|
||||
goto crack_default;
|
||||
|
||||
if (k >= 0)
|
||||
switch (DYNAMICTILEMAP(k))
|
||||
{
|
||||
case FIREEXT__STATIC:
|
||||
|
@ -1995,6 +1996,7 @@ ACTOR_STATIC void G_MoveStandables(void)
|
|||
|
||||
goto DETONATE;
|
||||
|
||||
crack_default:
|
||||
default:
|
||||
s->cstat = t[0];
|
||||
s->ang = t[1];
|
||||
|
|
|
@ -224,8 +224,8 @@ enum sflags_t {
|
|||
SPRITE_DIDNOSE7WATER = 0x00080000, // used temporarily
|
||||
};
|
||||
|
||||
// custom projectiles
|
||||
// KEEPINSYNC lunatic/con_lang.lua
|
||||
// Custom projectiles "workslike" flags.
|
||||
// XXX: Currently not predefined from CON.
|
||||
enum pflags_t {
|
||||
PROJECTILE_HITSCAN = 0x00000001,
|
||||
PROJECTILE_RPG = 0x00000002,
|
||||
|
|
Loading…
Reference in a new issue