diff --git a/src/k_kart.c b/src/k_kart.c index c3f1f1156..7c1e6a2d7 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3556,6 +3556,26 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj) return K_CheckSlopeRollDist(mobj); } +// reset banan and eggbox rollangle when they´re on the ground +// if not cv_bananthrowroll option "+Onground" +static void K_ResetBananaRollangle(mobj_t* mo) +{ + if (cv_bananthrowroll.value != 1) + return; + + if (!mo->rollangle) + return; + + if (mo->type != MT_BANANA && mo->type != MT_EGGMANITEM) + return; + + // only reset if on ground + if (!P_IsObjectOnGround(mo)) + return; + + mo->rollangle = 0; +} + #define SLOPEROLL_DIV 3 void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope) { @@ -3569,6 +3589,9 @@ void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope) I_Assert(mo->subsector != NULL); I_Assert(mo->subsector->sector != NULL); + // kinda stupid but idk where else to put this + K_ResetBananaRollangle(mo); + if (!K_ShouldSlopeRoll(mo)) { mo->pitch_sprite = mo->roll_sprite = 0; @@ -4026,11 +4049,9 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map if (cv_bananthrowroll.value && (mapthing == MT_BANANA)) { - //mo->angle = FixedAngle(M_RandomRange(-180, 180) << FRACBITS); - if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mo)) - mo->sloperoll = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); // im lazy but this makes sure the banan goes back to upright when it lands lmao - else if (cv_bananthrowroll.value == 2) - mo->rollangle = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); + const angle_t speen = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); + //mo->angle = speen; + mo->rollangle = speen; } } diff --git a/src/p_mobj.c b/src/p_mobj.c index ff8229c4f..c1edcae6b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7007,11 +7007,9 @@ static boolean P_MobjDeadThink(mobj_t *mobj) case MT_BANANA: if (cv_bananthrowroll.value) { - //mobj->angle -= spin; - if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj)) - mobj->sloperoll += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao - else if (cv_bananthrowroll.value == 2) - mobj->rollangle += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); + const angle_t speen = (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); + //mobj->angle -= speen; + mobj->rollangle += speen; } /* FALLTHRU */ case MT_ORBINAUT: @@ -7324,22 +7322,24 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } case MT_BANANA: case MT_EGGMANITEM: + { + boolean grounded = P_IsObjectOnGround(mobj); + //P_MobjCheckWaterVisual(mobj); - if (cv_bananthrowroll.value && !P_IsObjectOnGround(mobj)) + if (cv_bananthrowroll.value && !grounded) { // tilt n tumble - //mobj->angle += spin; - - if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj)) - mobj->sloperoll -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao - else if (cv_bananthrowroll.value == 2) - mobj->rollangle -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); + const angle_t speen = (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); + //mobj->angle += speen; + mobj->rollangle -= speen; } mobj->friction = ORIG_FRICTION/4; + if (mobj->momx || mobj->momy) P_SpawnGhostMobj(mobj); - if (P_IsObjectOnGround(mobj) && mobj->health > 1) + + if (grounded && mobj->health > 1) { S_StartSound(mobj, mobj->info->activesound); mobj->momx = mobj->momy = 0; @@ -7352,7 +7352,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj) if (mobj->threshold > 0) mobj->threshold--; + break; + } case MT_SPB: indirectitemcooldown = 20*TICRATE; /* FALLTHRU */