diff --git a/src/p_spec.h b/src/p_spec.h index 9a71f32efacb8a1211215a2bdbaa341beacf0939..824738188b680edc9f194193cf5aa2d84fa925be 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -394,7 +394,7 @@ typedef struct // SRB2kart - TODO: To satisfy Iceman's craving, I'll leave this here: 62914 : Is the number he wants friction to be. // Friction defines. -#define ORIG_FRICTION (0xE8 << (FRACBITS-8)) ///< Original value. +#define ORIG_FRICTION (62914) ///< Original value. #define ORIG_FRICTION_FACTOR (8 << (FRACBITS-8)) ///< Original value. void T_Friction(friction_t *f); diff --git a/src/p_user.c b/src/p_user.c index a5417478ce56e058f3c5b3449f2bee3b41f76c21..c2709ac5a209bae342a3de2595108a4ff7153a93 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3584,6 +3584,8 @@ void P_DoJump(player_t *player, boolean soundandstate) fixed_t factor; const fixed_t dist6 = FixedMul(FixedDiv(player->speed, player->mo->scale), player->actionspd)/20; + return; + if (player->pflags & PF_JUMPSTASIS) return;