diff --git a/src/p_inter.c b/src/p_inter.c index 3a97433a1..a16705741 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1452,6 +1452,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget mobj_t *owner = target->target; mobj_t *overlay; + S_StartSound(target, sfx_kc52); target->flags &= ~MF_NOGRAVITY; target->destscale = (3 * target->destscale) / 2; @@ -1459,12 +1460,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget if (owner && !P_MobjWasRemoved(owner)) { - /* - target->momx = owner->momx / 2; - target->momy = owner->momy / 2; - target->momz = owner->momz / 2; - */ - P_Thrust(target, R_PointToAngle2(owner->x, owner->y, target->x, target->y), 4 * target->scale); } diff --git a/src/p_mobj.c b/src/p_mobj.c index b74380517..e04c90fea 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -5286,6 +5286,11 @@ static void P_MobjSceneryThink(mobj_t *mobj) { mobj->fuse--; + if (!S_SoundPlaying(mobj, sfx_cdfm71)) + { + S_StartSound(mobj, sfx_cdfm71); + } + if (mobj->fuse <= 0) { statenum_t curState = (mobj->state - states); @@ -5359,6 +5364,7 @@ static void P_MobjSceneryThink(mobj_t *mobj) if (i & 1) { blast->angle += ANGLE_90; + S_StartSound(blast, sfx_cdfm64); } } diff --git a/src/sounds.c b/src/sounds.c index d06e521d0..dc777a088 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -740,14 +740,14 @@ sfxinfo_t S_sfx[NUMSFX] = {"cdfm61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speed boost"}, {"cdfm63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm64", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm64", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm70", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm71", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"cdfm74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, @@ -808,7 +808,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"kc50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"kc51", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc52", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"kc53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"kc54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"kc55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},