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

Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale.

Browse source
This commit is contained in:
toaster 2019-09-08 21:21:36 +01:00
parent d26ff197dc
commit 11e3f5ec96
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/m_cheat.c
View file

@ -833,7 +833,10 @@ void Command_Savecheckpoint_f(void)
players[consoleplayer].starpostangle = players[consoleplayer].mo->angle;
players[consoleplayer].starpostscale = players[consoleplayer].mo->destscale;
if (players[consoleplayer].mo->flags2 & MF2_OBJECTFLIP)
{
players[consoleplayer].starpostscale *= -1;
players[consoleplayer].starpostz += players[consoleplayer].mo->height;
}
CONS_Printf(M_GetText("Temporary checkpoint created at %d, %d, %d\n"), players[consoleplayer].starpostx, players[consoleplayer].starposty, players[consoleplayer].starpostz);
}

4
src/p_inter.c
View file

@ -1431,7 +1431,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->flags2 & MF2_OBJECTFLIP)
{
players[i].starpostscale *= -1;
players[i].starpostz += (special->height - P_GetPlayerHeight(player))>>FRACBITS;
players[i].starpostz += special->height>>FRACBITS;
}
players[i].starpostnum = special->health;
@ -1453,7 +1453,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->flags2 & MF2_OBJECTFLIP)
{
player->starpostscale *= -1;
player->starpostz += (special->height - P_GetPlayerHeight(player))>>FRACBITS;
player->starpostz += special->height>>FRACBITS;
}
player->starpostnum = special->health;
S_StartSound(toucher, special->info->painsound);

26
src/p_mobj.c
View file

@ -10669,24 +10669,26 @@ void P_MovePlayerToStarpost(INT32 playernum)
P_SetScale(mobj, (mobj->destscale = abs(p->starpostscale)));
mobj->floorz = floor;
mobj->ceilingz = ceiling;
if (z <= floor)
z = floor;
else if (z >= ceiling - mobj->height)
z = ceiling - mobj->height;
mobj->z = z;
if (p->starpostscale < 0)
{
mobj->flags2 |= MF2_OBJECTFLIP;
if (mobj->z + mobj->height == mobj->ceilingz)
if (z >= ceiling)
{
mobj->eflags |= MFE_ONGROUND;
z = ceiling;
}
z -= mobj->height;
}
else if (mobj->z == mobj->floorz)
else if (z <= floor)
{
mobj->eflags |= MFE_ONGROUND;
z = floor;
}
mobj->floorz = floor;
mobj->ceilingz = ceiling;
mobj->z = z;
mobj->angle = p->starpostangle;