Merge branch 'my-junk' into 'next'
Initialize dummy linedef tag lists See merge request STJr/SRB2!1279
This commit is contained in:
commit
0b2e60ba1d
|
@ -3924,6 +3924,10 @@ void A_BossDeath(mobj_t *mo)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// Initialize my junk
|
||||||
|
junk.tags.tags = NULL;
|
||||||
|
junk.tags.count = 0;
|
||||||
|
|
||||||
// Bring the egg trap up to the surface
|
// Bring the egg trap up to the surface
|
||||||
// Incredibly shitty code ahead
|
// Incredibly shitty code ahead
|
||||||
Tag_FSet(&junk.tags, LE_CAPSULE0);
|
Tag_FSet(&junk.tags, LE_CAPSULE0);
|
||||||
|
@ -4053,6 +4057,10 @@ bossjustdie:
|
||||||
}
|
}
|
||||||
case MT_KOOPA:
|
case MT_KOOPA:
|
||||||
{
|
{
|
||||||
|
// Initialize my junk
|
||||||
|
junk.tags.tags = NULL;
|
||||||
|
junk.tags.count = 0;
|
||||||
|
|
||||||
Tag_FSet(&junk.tags, LE_KOOPA);
|
Tag_FSet(&junk.tags, LE_KOOPA);
|
||||||
EV_DoCeiling(&junk, raiseToHighest);
|
EV_DoCeiling(&junk, raiseToHighest);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1388,6 +1388,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||||
if (player->bot)
|
if (player->bot)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Initialize my junk
|
||||||
|
junk.tags.tags = NULL;
|
||||||
|
junk.tags.count = 0;
|
||||||
|
|
||||||
Tag_FSet(&junk.tags, LE_AXE);
|
Tag_FSet(&junk.tags, LE_AXE);
|
||||||
EV_DoElevator(&junk, bridgeFall, false);
|
EV_DoElevator(&junk, bridgeFall, false);
|
||||||
|
|
||||||
|
|
10
src/p_spec.c
10
src/p_spec.c
|
@ -4420,15 +4420,19 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
|
||||||
// clear the special so you can't push the button twice.
|
// clear the special so you can't push the button twice.
|
||||||
sector->special = 0;
|
sector->special = 0;
|
||||||
|
|
||||||
|
// Initialize my junk
|
||||||
|
junk.tags.tags = NULL;
|
||||||
|
junk.tags.count = 0;
|
||||||
|
|
||||||
// Move the button down
|
// Move the button down
|
||||||
Tag_FSet(&junk.tags, 680);
|
Tag_FSet(&junk.tags, LE_CAPSULE0);
|
||||||
EV_DoElevator(&junk, elevateDown, false);
|
EV_DoElevator(&junk, elevateDown, false);
|
||||||
|
|
||||||
// Open the top FOF
|
// Open the top FOF
|
||||||
Tag_FSet(&junk.tags, 681);
|
Tag_FSet(&junk.tags, LE_CAPSULE1);
|
||||||
EV_DoFloor(&junk, raiseFloorToNearestFast);
|
EV_DoFloor(&junk, raiseFloorToNearestFast);
|
||||||
// Open the bottom FOF
|
// Open the bottom FOF
|
||||||
Tag_FSet(&junk.tags, 682);
|
Tag_FSet(&junk.tags, LE_CAPSULE2);
|
||||||
EV_DoCeiling(&junk, lowerToLowestFast);
|
EV_DoCeiling(&junk, lowerToLowestFast);
|
||||||
|
|
||||||
// Mark all players with the time to exit thingy!
|
// Mark all players with the time to exit thingy!
|
||||||
|
|
Loading…
Reference in New Issue