diff --git a/src/p_inter.c b/src/p_inter.c index 4db690145..972ae16cc 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1905,6 +1905,45 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) } break; + case MT_BANANA: + case MT_BANANA_SHIELD: + { + const UINT8 numParticles = 8; + const angle_t diff = ANGLE_MAX / numParticles; + UINT8 i; + + for (i = 0; i < numParticles; i++) + { + mobj_t *spark = P_SpawnMobj(target->x, target->y, target->z - target->height, MT_WIPEOUTTRAIL); + spark->angle = (diff * i) - (diff / 2); + + if (inflictor != NULL && P_MobjWasRemoved(inflictor) == false) + { + // K_MomentumAngle + if (FixedHypot(inflictor->momx, inflictor->momy) >= inflictor->scale) + { + spark->angle += R_PointToAngle2(0, 0, inflictor->momx, inflictor->momy); + } + else + { + spark->angle += inflictor->angle; // default to facing angle, rather than 0 + } + + spark->momx += inflictor->momx / 2; + spark->momy += inflictor->momy / 2; + spark->momz += inflictor->momz / 2; + } + + //spark->spriteyscale = FRACUNIT/2; + //spark->spritexscale = FRACUNIT/2; + + P_SetObjectMomZ(spark, (6 + M_RandomRange(-4, 4)) * FRACUNIT, true); + P_Thrust(spark, spark->angle, (6 + M_RandomRange(-4, 4)) * spark->scale); + + } + break; + } + default: break; } diff --git a/src/p_mobj.c b/src/p_mobj.c index b2f4a2994..39770c9ea 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6176,6 +6176,42 @@ angle_t P_MobjPitchAndRoll(mobj_t *mobj) return return_angle; } +static void P_SpawnItemLandDust(mobj_t *mobj) +{ + const UINT8 numParticles = 5; + const angle_t diff = ANGLE_MAX / numParticles; + UINT8 i; + + for (i = 0; i < numParticles; i++) + { + mobj_t *spark = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_WIPEOUTTRAIL); + spark->angle = (diff * i) - (diff / 2); + + if (mobj != NULL && P_MobjWasRemoved(mobj) == false) + { + // K_MomentumAngle + if (FixedHypot(mobj->momx, mobj->momy) >= mobj->scale) + { + spark->angle += R_PointToAngle2(0, 0, mobj->momx, mobj->momy); + } + else + { + spark->angle += mobj->angle; // default to facing angle, rather than 0 + } + + spark->momx += mobj->momx / 2; + spark->momy += mobj->momy / 2; + spark->momz += mobj->momz / 2; + } + + //spark->spriteyscale = FRACUNIT/2; + //spark->spritexscale = FRACUNIT/2; + + P_SetObjectMomZ(spark, (6 + M_RandomRange(-4, 4)) * FRACUNIT, true); + P_Thrust(spark, spark->angle, (6 + M_RandomRange(-4, 4)) * spark->scale); + } +} + // // P_MobjThinker // @@ -7907,6 +7943,8 @@ void P_MobjThinker(mobj_t *mobj) S_StartSound(mobj, mobj->info->activesound); mobj->momx = mobj->momy = 0; mobj->health = 1; + + P_SpawnItemLandDust(mobj); } P_RollPitchMobj(mobj); @@ -7953,6 +7991,8 @@ void P_MobjThinker(mobj_t *mobj) S_StartSound(mobj, mobj->info->activesound); P_SetMobjState(mobj, S_SSMINE_DEPLOY1); } + + P_SpawnItemLandDust(mobj); } if ((mobj->state >= &states[S_SSMINE1] && mobj->state <= &states[S_SSMINE4])