stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-21 11:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt some more player spawning stuff to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-12-26 21:11:24 +01:00
parent ea6fe56df6
commit 8535b595d6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_demo.c
View file

@ -2212,7 +2212,7 @@ void G_AddGhost(char *defdemoname)
gh->mo->angle = FixedAngle(mthing->angle << FRACBITS); gh->mo->angle = FixedAngle(mthing->angle << FRACBITS);
f = gh->mo->floorz; f = gh->mo->floorz;
c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height; c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height;
if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP)) if (!!(mthing->args[0]) ^ !!(mthing->options & MTF_OBJECTFLIP))
{ {
z = c - offset; z = c - offset;
if (z < f) if (z < f)

2
src/m_cheat.c
View file

@ -539,7 +539,7 @@ void Command_Teleport_f(void)
// Flagging a player's ambush will make them start on the ceiling // Flagging a player's ambush will make them start on the ceiling
// Objectflip inverts // Objectflip inverts
if (!!(mt->options & MTF_AMBUSH) ^ !!(mt->options & MTF_OBJECTFLIP)) if (!!(mt->args[0]) ^ !!(mt->options & MTF_OBJECTFLIP))
intz = ss->sector->ceilingheight - p->mo->height - offset; intz = ss->sector->ceilingheight - p->mo->height - offset;
else else
intz = ss->sector->floorheight + offset; intz = ss->sector->floorheight + offset;

2
src/p_mobj.c
View file

@ -11652,7 +11652,7 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
mobj->eflags |= MFE_VERTICALFLIP; mobj->eflags |= MFE_VERTICALFLIP;
mobj->flags2 |= MF2_OBJECTFLIP; mobj->flags2 |= MF2_OBJECTFLIP;
} }
if (mthing->options & MTF_AMBUSH) if (mthing->args[0])
P_SetPlayerMobjState(mobj, S_PLAY_FALL); P_SetPlayerMobjState(mobj, S_PLAY_FALL);
else if (metalrecording) else if (metalrecording)
P_SetPlayerMobjState(mobj, S_PLAY_WAIT); P_SetPlayerMobjState(mobj, S_PLAY_WAIT);