diff --git a/src/k_kart.c b/src/k_kart.c index 5a261394e..9927c1d2e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1753,6 +1753,7 @@ static void K_SpawnDashDustRelease(player_t *player) dust->momx = 3*player->mo->momx/5; dust->momy = 3*player->mo->momy/5; + dust->momz = 3*P_GetMobjZMovement(player->mo)/5; //dust->momz = 3*player->mo->momz/5; K_MatchGenericExtraFlags(dust, player->mo); @@ -3170,6 +3171,7 @@ static void K_SpawnDriftSparks(player_t *player) spark->momx = player->mo->momx/2; spark->momy = player->mo->momy/2; + spark->momz = P_GetMobjZMovement(player->mo)/2; //spark->momz = player->mo->momz/2; // rotate the sparks based on pitch and roll; it just looks neat @@ -3238,6 +3240,7 @@ static void K_SpawnAIZDust(player_t *player) spark->momx = (6*player->mo->momx)/5; spark->momy = (6*player->mo->momy)/5; + spark->momz = P_GetMobjZMovement(player->mo); //spark->momz = player->mo->momz/2; K_MatchGenericExtraFlags(spark, player->mo); @@ -3563,7 +3566,8 @@ void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) { dust->momx = mo->momx/2; dust->momy = mo->momy/2; - dust->momz = mo->momz/2; + dust->momz = P_GetMobjZMovement(mo)/2; + //dust->momz = mo->momz/2; } if (translucent) @@ -5149,7 +5153,8 @@ static inline void K_SpawnNormalSpeedLines(player_t *player) fast->angle = K_MomentumAngle(player->mo, 6*player->mo->scale); fast->momx = 3*player->mo->momx/4; fast->momy = 3*player->mo->momy/4; - fast->momz = 3*player->mo->momz/4; + fast->momz = 3*P_GetMobjZMovement(player->mo)/4; + //fast->momz = 3*player->mo->momz/4; P_SetTarget(&fast->target, player->mo); // easier lua access if (goodSpeed) diff --git a/src/p_local.h b/src/p_local.h index acb62ad67..bfe05f739 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -315,6 +315,8 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration); #define PAL_RECYCLE 3 #define PAL_NUKE 4 +fixed_t P_GetMobjZMovement(mobj_t *mo); + // // P_ENEMY // diff --git a/src/p_mobj.c b/src/p_mobj.c index 4c4c89505..d8e2dc4d1 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12544,3 +12544,21 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration) pl->flashcount = duration; pl->flashpal = type; } + +fixed_t P_GetMobjZMovement(mobj_t *mo) +{ + pslope_t *slope = mo->standingslope; + angle_t angDiff; + fixed_t speed; + + if (!P_IsObjectOnGround(mo)) + return mo->momz; + + if (!slope) + return 0; + + angDiff = R_PointToAngle2(0, 0, mo->momx, mo->momy) - slope->xydirection; + speed = FixedHypot(mo->momx, mo->momy); + + return P_ReturnThrustY(mo, slope->zangle, P_ReturnThrustX(mo, angDiff, speed)); +}