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

Making things more scale-friendly (but it's not perfect...)

Browse source
This commit is contained in:
toasterbabe 2016-10-24 13:52:36 +01:00
parent bf873f8a9b
commit cc4d780371
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_mobj.c
View file

@ -6819,7 +6819,6 @@ void P_MobjThinker(mobj_t *mobj)
whoosh->destscale = whoosh->scale<<1; whoosh->destscale = whoosh->scale<<1;
whoosh->fuse = 10; whoosh->fuse = 10;
whoosh->flags |= MF_NOCLIPHEIGHT; whoosh->flags |= MF_NOCLIPHEIGHT;
whoosh->height = 42*FRACUNIT;
mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh
} }
case MT_FLAMEAURA_ORB: case MT_FLAMEAURA_ORB:

2
src/p_user.c
View file

@ -6994,7 +6994,7 @@ static void P_MovePlayer(player_t *player)
{ {
player->pflags |= PF_THOKKED|PF_SHIELDABILITY; player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
#if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible #if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible
P_SetObjectMomZ(player->mo, -4*P_GetMobjGravity(player->mo), false); P_SetObjectMomZ(player->mo, FixedDiv(-4*P_GetMobjGravity(player->mo), player->mo->scale), false);
#else #else
player->mo->momz = // intentionally carries to post-endif line as multiple-assignment player->mo->momz = // intentionally carries to post-endif line as multiple-assignment
#endif #endif