From 939a7b8b2e2f368c7e045170c1e64aee98907f3d Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Wed, 25 Jan 2017 14:52:36 +0000
Subject: [PATCH] Fixed the missing Mario Puma/poodoo sounds.
---
src/dehacked.c | 2 ++
src/info.c | 6 ++++--
src/info.h | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index 8b43b9b6c0..629224c772 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6102,6 +6102,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FIREBALLEXP2",
"S_FIREBALLEXP3",
"S_SHELL",
+ "S_PUMA_START1",
+ "S_PUMA_START2",
"S_PUMA_UP1",
"S_PUMA_UP2",
"S_PUMA_UP3",
diff --git a/src/info.c b/src/info.c
index 37f7aebafa..9656030d15 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2745,6 +2745,8 @@ state_t states[NUMSTATES] =
{SPR_SHLL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SHELL
// 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, {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
@@ -13157,9 +13159,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_PUMA
1805, // doomednum
- S_PUMA_UP1, // spawnstate
+ S_PUMA_START1, // spawnstate
1000, // spawnhealth
- S_PUMA_UP1, // seestate
+ S_PUMA_START1, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
diff --git a/src/info.h b/src/info.h
index d82c0d5783..f505643726 100644
--- a/src/info.h
+++ b/src/info.h
@@ -2907,6 +2907,8 @@ typedef enum state
S_FIREBALLEXP2,
S_FIREBALLEXP3,
S_SHELL,
+ S_PUMA_START1,
+ S_PUMA_START2,
S_PUMA_UP1,
S_PUMA_UP2,
S_PUMA_UP3,
--
GitLab