Merge branch 'platform-fixes' into 'next'
Reset pmomz after applying it to momz See merge request STJr/SRB2!747
This commit is contained in:
commit
52c1e73035
|
@ -2350,6 +2350,7 @@ static void P_RingZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
mo->z += mo->momz;
|
mo->z += mo->momz;
|
||||||
|
@ -2419,6 +2420,7 @@ static boolean P_ZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
mo->z += mo->momz;
|
mo->z += mo->momz;
|
||||||
|
@ -2907,6 +2909,7 @@ static void P_PlayerZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3157,6 +3160,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
mo->z += mo->momz;
|
mo->z += mo->momz;
|
||||||
|
|
|
@ -2380,6 +2380,8 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (player->charability == CA_GLIDEANDCLIMB && (player->mo->state-states == S_PLAY_GLIDE_LANDING))
|
||||||
|
;
|
||||||
else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2)
|
else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2)
|
||||||
;
|
;
|
||||||
else if (player->panim != PA_IDLE && player->panim != PA_WALK && player->panim != PA_RUN && player->panim != PA_DASH)
|
else if (player->panim != PA_IDLE && player->panim != PA_WALK && player->panim != PA_RUN && player->panim != PA_DASH)
|
||||||
|
@ -4537,16 +4539,14 @@ void P_DoJump(player_t *player, boolean soundandstate)
|
||||||
player->mo->z--;
|
player->mo->z--;
|
||||||
if (player->mo->pmomz < 0)
|
if (player->mo->pmomz < 0)
|
||||||
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
||||||
else
|
player->mo->pmomz = 0;
|
||||||
player->mo->pmomz = 0;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
player->mo->z++;
|
player->mo->z++;
|
||||||
if (player->mo->pmomz > 0)
|
if (player->mo->pmomz > 0)
|
||||||
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
||||||
else
|
player->mo->pmomz = 0;
|
||||||
player->mo->pmomz = 0;
|
|
||||||
}
|
}
|
||||||
player->mo->eflags &= ~MFE_APPLYPMOMZ;
|
player->mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue