zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle tilenum access in movetransports_d.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-30 00:47:09 +01:00
parent 91d864ac8f
commit b2b4d432fc
1 changed files with 59 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/games/duke/src/actors_d.cpp
View file

@ -453,22 +453,19 @@ void movetransports_d(void)
if (warpspriteto) if (warpspriteto)
{ {
if ((act2->flags1 & SFLAG_NOTELEPORT)) continue; if ((act2->flags1 & SFLAG_NOTELEPORT)) continue;
switch (act2->spr.picnum) if (act2->GetClass() == DukePlayerOnWaterClass)
{ {
case DTILE_PLAYERONWATER: if (sectlotag == ST_2_UNDERWATER)
if (sectlotag == 2)
{ {
act2->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE; act2->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE;
break; continue;
}
}
if (act2->GetClass() != DukeWaterBubbleClass)
{
if (act2->spr.statnum == STAT_MISC && !(sectlotag == ST_1_ABOVE_WATER || sectlotag == ST_2_UNDERWATER))
continue;
} }
[[fallthrough]];
default:
if (act2->spr.statnum == 5 && !(sectlotag == 1 || sectlotag == 2))
break;
[[fallthrough]];
case DTILE_WATERBUBBLE:
if (sectlotag > 0) if (sectlotag > 0)
{ {
auto k = spawn(act2, DukeWaterSplashClass); auto k = spawn(act2, DukeWaterSplashClass);
@ -531,9 +528,6 @@ void movetransports_d(void)
ChangeActorSect(act2, Owner->sector()); ChangeActorSect(act2, Owner->sector());
break; break;
} }
break;
}
} }
} }
break; break;
@ -723,7 +717,7 @@ void moveeffectors_d(void) //STATNUM 3
handle_se02(act); handle_se02(act);
break; break;
//Flashing sector lights after reactor DTILE_EXPLOSION2 //Flashing sector lights after reactor explosion
case SE_3_RANDOM_LIGHTS_AFTER_SHOT_OUT: case SE_3_RANDOM_LIGHTS_AFTER_SHOT_OUT:
handle_se03(act); handle_se03(act);
break; break;