stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable the old hacky way of doing egg capsules in UDMF maps

Browse source
This commit is contained in:
MascaraSnake 2021-12-28 23:51:08 +01:00
parent 2a868ca60d
commit e76d332678
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdef.h
View file

@ -401,7 +401,7 @@ extern skincolor_t skincolors[MAXSKINCOLORS];
#define PUSHACCEL (2*FRACUNIT) // Acceleration for MF2_SLIDEPUSH items.
// Special linedef executor tag numbers!
// Special linedef executor tag numbers! Binary map format only (UDMF has other ways of doing these things).
enum {
LE_PINCHPHASE = -2, // A boss entered pinch phase (and, in most cases, is preparing their pinch phase attack!)
LE_ALLBOSSESDEAD = -3, // All bosses in the map are dead (Egg capsule raise)

13
src/p_enemy.c
View file

@ -3928,11 +3928,14 @@ static void P_DoBossVictory(mobj_t *mo)
}
else
{
// Bring the egg trap up to the surface
// Incredibly shitty code ahead
EV_DoElevator(LE_CAPSULE0, NULL, elevateHighest);
EV_DoElevator(LE_CAPSULE1, NULL, elevateUp);
EV_DoElevator(LE_CAPSULE2, NULL, elevateHighest);
if (!udmf)
{
// Bring the egg trap up to the surface
// Incredibly shitty code ahead
EV_DoElevator(LE_CAPSULE0, NULL, elevateHighest);
EV_DoElevator(LE_CAPSULE1, NULL, elevateUp);
EV_DoElevator(LE_CAPSULE2, NULL, elevateHighest);
}
if (mapheaderinfo[gamemap-1]->muspostbossname[0] &&
S_MusicExists(mapheaderinfo[gamemap-1]->muspostbossname, !midi_disabled, !digital_disabled))

2
src/p_spec.c
View file

@ -4860,7 +4860,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
case 8: // Tells pushable things to check FOFs
break;
case 9: // Egg trap capsule
if (roversector)
if (!udmf && roversector)
P_ProcessEggCapsule(player, sector);
break;
case 10: // Special Stage Time/Rings