diff --git a/src/k_kart.c b/src/k_kart.c index fccb6867..f33d84a8 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4846,7 +4846,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) && player->kartstuff[k_growshrinktimer] <= 0) // Grow holds the item box hostage { K_PlayPowerGloatSound(player->mo); - player->mo->scalespeed = FRACUNIT/TICRATE; + player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE; player->mo->destscale = 3*(mapheaderinfo[gamemap-1]->mobj_scale)/2; if (cv_kartdebugshrink.value && !player->bot) player->mo->destscale = 6*player->mo->destscale/8; diff --git a/src/p_floor.c b/src/p_floor.c index 075ad1da..3365b4b9 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -3003,6 +3003,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) fixed_t topz; fixed_t a, b, c; mobjtype_t type = MT_ROCKCRUMBLE1; + const fixed_t spacing = 48*mapheaderinfo[gamemap-1]->mobj_scale; // If the control sector has a special // of Section3:7-15, use the custom debris. @@ -3034,16 +3035,16 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) rightx = sec->lines[rightmostvertex]->v1->x; topy = sec->lines[topmostvertex]->v1->y-(16<lines[bottommostvertex]->v1->y; - topz = *rover->topheight-(16<topheight-(spacing/2); - for (a = leftx; a < rightx; a += (32< bottomy; b -= (32< bottomy; b -= spacing) { if (R_PointInSubsector(a, b)->sector == sec) { mobj_t *spawned = NULL; - for (c = topz; c > *rover->bottomheight; c -= (32< *rover->bottomheight; c -= spacing) { spawned = P_SpawnMobj(a, b, c, type); spawned->fuse = 3*TICRATE; diff --git a/src/p_inter.c b/src/p_inter.c index cd0ed893..05001ced 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -395,7 +395,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) P_SetTarget(&special->tracer, toucher); special->flags2 |= MF2_NIGHTSPULL; special->destscale = mapheaderinfo[gamemap-1]->mobj_scale>>4; - special->scalespeed <<= 1; + special->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/6; // (FRACUNIT/12)<<1 but mapheader-scale-considering special->flags &= ~MF_SPECIAL; return; @@ -3329,7 +3329,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (!player->kartstuff[k_invincibilitytimer] && player->kartstuff[k_growshrinktimer] <= 0) { // Start shrinking! - player->mo->scalespeed = FRACUNIT/TICRATE; + player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE; player->mo->destscale = 6*(mapheaderinfo[gamemap-1]->mobj_scale)/8; if (cv_kartdebugshrink.value && !player->bot) player->mo->destscale = 6*player->mo->destscale/8;