diff --git a/src/p_local.h b/src/p_local.h index 1fd7ada04..f81053ee4 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -403,7 +403,7 @@ extern INT32 ceilmovesound; // Factor to scale scrolling effect into mobj-carrying properties = 3/32. // (This is so scrolling floors and objects on them can move at same speed.) -#define CARRYFACTOR ((3*FRACUNIT)/32) +#define CARRYFACTOR (FRACUNIT-ORIG_FRICTION) void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, INT16 starpostx, INT16 starposty, INT16 starpostz, diff --git a/src/p_spec.c b/src/p_spec.c index 3aaaeb059..3d5800154 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -6532,8 +6532,8 @@ static void P_DoScrollMove(mobj_t *thing, fixed_t dx, fixed_t dy, INT32 exclusiv { thing->player->cmomx += dx; thing->player->cmomy += dy; - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); + thing->player->cmomx = FixedMul(thing->player->cmomx, ORIG_FRICTION); + thing->player->cmomy = FixedMul(thing->player->cmomy, ORIG_FRICTION); } } @@ -7306,8 +7306,8 @@ static inline boolean PIT_PushThing(mobj_t *thing) { thing->player->cmomx += tmpmomx; thing->player->cmomy += tmpmomy; - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); + thing->player->cmomx = FixedMul(thing->player->cmomx, ORIG_FRICTION); + thing->player->cmomy = FixedMul(thing->player->cmomy, ORIG_FRICTION); } } else @@ -7325,8 +7325,8 @@ static inline boolean PIT_PushThing(mobj_t *thing) { thing->player->cmomx += FixedMul(speed, FINECOSINE(pushangle)); thing->player->cmomy += FixedMul(speed, FINESINE(pushangle)); - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); + thing->player->cmomx = FixedMul(thing->player->cmomx, ORIG_FRICTION); + thing->player->cmomy = FixedMul(thing->player->cmomy, ORIG_FRICTION); } } } @@ -7365,8 +7365,8 @@ static inline boolean PIT_PushThing(mobj_t *thing) { thing->player->cmomx += tmpmomx; thing->player->cmomy += tmpmomy; - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); + thing->player->cmomx = FixedMul(thing->player->cmomx, ORIG_FRICTION); + thing->player->cmomy = FixedMul(thing->player->cmomy, ORIG_FRICTION); } } }