From 82fcdf4d43d591aff8ae1a2ab97adf73f5c5da79 Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Wed, 9 Oct 2019 14:24:27 +0800
Subject: [PATCH] Make MT_PUMA not hurt players' ears when placed in groups or
loading the map (new functionality for A_PlaySound)
---
src/info.c | 2 +-
src/p_enemy.c | 9 ++++++---
src/sounds.c | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/info.c b/src/info.c
index b2e6d5689b..889402addc 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3594,7 +3594,7 @@ state_t states[NUMSTATES] =
// Puma (Mario fireball)
{SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_START2}, // S_PUMA_START1
- {SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_PlaySound}, sfx_s3k70, 1, S_PUMA_UP1}, // S_PUMA_START2
+ {SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_PlaySound}, sfx_s3k70, 1 + (1<<16), S_PUMA_UP1}, // S_PUMA_START2
{SPR_PUMA, FF_FULLBRIGHT , 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP2}, // S_PUMA_UP1
{SPR_PUMA, FF_FULLBRIGHT|1, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP3}, // S_PUMA_UP2
{SPR_PUMA, FF_FULLBRIGHT|2, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP1}, // S_PUMA_UP3
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 1d14ebfc9e..4add7a576c 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8416,8 +8416,8 @@ void A_ChangeAngleAbsolute(mobj_t *actor)
//
// var1 = sound # to play
// var2:
-// 0 = Play sound without an origin
-// 1 = Play sound using calling object as origin
+// lower 16 bits = If 1, play sound using calling object as origin. If 0, play sound without an origin
+// upper 16 bits = If 1, do not play sound during preticker.
//
void A_PlaySound(mobj_t *actor)
{
@@ -8428,7 +8428,10 @@ void A_PlaySound(mobj_t *actor)
return;
#endif
- S_StartSound(locvar2 ? actor : NULL, locvar1);
+ if (leveltime < 2 && (locvar2 >> 16))
+ return;
+
+ S_StartSound((locvar2 & 65535) ? actor : NULL, locvar1);
}
// Function: A_FindTarget
diff --git a/src/sounds.c b/src/sounds.c
index cc4f59a0c1..e5dfeec8ad 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -506,7 +506,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s3k6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical damage"},
{"s3k6f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},
- {"s3k70", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"},
+ {"s3k70", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"},
{"s3k71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Basic Shield"},
{"s3k72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"},
{"s3k73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"},
--
GitLab