From 5ac594abf57fcdd329a8128851399eee9e0ce326 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sat, 8 Jun 2019 14:12:39 +0200 Subject: [PATCH] Fixed dust scaling, changed sound captions --- src/p_enemy.c | 6 +++--- src/sounds.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index ba1fe266c..781f0ff15 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -12596,7 +12596,7 @@ void A_DustDevilThink(mobj_t *actor) fixed_t scale = actor->scale; mobj_t *layer = actor->tracer; INT32 bx, by, xl, xh, yl, yh; - fixed_t radius = actor->radius + MAXRADIUS; + fixed_t radius = actor->radius; #ifdef HAVE_BLUA if (LUA_CallAction("A_DustDevilThink", actor)) @@ -12615,12 +12615,12 @@ void A_DustDevilThink(mobj_t *actor) } //Spawn random dust around the column on the base. - //TODO: Dust shouldn't be shrinking if (P_IsObjectOnGround(actor)) { angle_t dustang = ((P_RandomRange(0, 7)*ANGLE_45)>>ANGLETOFINESHIFT) & FINEMASK; mobj_t *dust = P_SpawnMobj(actor->x + 96 * FixedMul(scale, FINECOSINE(dustang)), actor->y + 96 * FixedMul(scale, FINESINE(dustang)), actor->z, MT_ARIDDUST); P_SetMobjState(dust, dust->info->spawnstate + P_RandomRange(0, 2)); - dust->scale = scale * 3; + dust->destscale = scale * 3; + P_SetScale(dust, dust->destscale); } actor->extravalue1++; diff --git a/src/sounds.c b/src/sounds.c index 66d498838..cd5abd1f5 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -311,7 +311,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pulse"}, {"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"}, {"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Grab"}, - {"s3k4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water splash"}, + {"s3k4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, {"s3k4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy hit"}, {"s3k4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing bullet"}, {"s3k4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, @@ -460,7 +460,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"s3kcds", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, {"s3kcdl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, // ditto {"s3kces", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind tunnel"}, - {"s3kcel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind tunnel"}, // ditto + {"s3kcel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dust devil"}, // ditto {"s3kcfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"s3kcfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto {"s3kd0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"},