mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'egg-capsule' into 'next'
Add "trigger egg capsule" linedef executor See merge request STJr/SRB2!916
This commit is contained in:
commit
6421b7b7e8
2 changed files with 49 additions and 0 deletions
|
|
@ -2245,6 +2245,13 @@ linedeftypes
|
||||||
title = "Dye Object";
|
title = "Dye Object";
|
||||||
prefix = "(463)";
|
prefix = "(463)";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
464
|
||||||
|
{
|
||||||
|
title = "Trigger Egg Capsule";
|
||||||
|
prefix = "(464)";
|
||||||
|
flags64text = "[6] Don't end level";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
linedefexecmisc
|
linedefexecmisc
|
||||||
|
|
@ -3731,6 +3738,7 @@ thingtypes
|
||||||
width = 8;
|
width = 8;
|
||||||
height = 16;
|
height = 16;
|
||||||
sprite = "internal:capsule";
|
sprite = "internal:capsule";
|
||||||
|
angletext = "Tag";
|
||||||
}
|
}
|
||||||
292
|
292
|
||||||
{
|
{
|
||||||
|
|
|
||||||
41
src/p_spec.c
41
src/p_spec.c
|
|
@ -4005,6 +4005,47 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 464: // Trigger Egg Capsule
|
||||||
|
{
|
||||||
|
thinker_t *th;
|
||||||
|
mobj_t *mo2;
|
||||||
|
|
||||||
|
// Find the center of the Eggtrap and release all the pretty animals!
|
||||||
|
// The chimps are my friends.. heeheeheheehehee..... - LouisJM
|
||||||
|
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
|
||||||
|
{
|
||||||
|
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
mo2 = (mobj_t *)th;
|
||||||
|
|
||||||
|
if (mo2->type != MT_EGGTRAP)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!mo2->spawnpoint)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (mo2->spawnpoint->angle != line->tag)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
P_KillMobj(mo2, NULL, mo, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(line->flags & ML_NOCLIMB))
|
||||||
|
{
|
||||||
|
INT32 i;
|
||||||
|
|
||||||
|
// Mark all players with the time to exit thingy!
|
||||||
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
|
{
|
||||||
|
if (!playeringame[i])
|
||||||
|
continue;
|
||||||
|
P_DoPlayerExit(&players[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 480: // Polyobj_DoorSlide
|
case 480: // Polyobj_DoorSlide
|
||||||
case 481: // Polyobj_DoorSwing
|
case 481: // Polyobj_DoorSwing
|
||||||
PolyDoor(line);
|
PolyDoor(line);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue