From 6e105a23f643c44e6986f5389e89b5a41476341e Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Wed, 2 Feb 2022 14:43:22 +0100
Subject: [PATCH] Update Nightopian states for the new sprites & fix another
bug
---
src/deh_tables.c | 15 +++++++--------
src/info.c | 23 +++++++++++------------
src/info.h | 15 +++++++--------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/deh_tables.c b/src/deh_tables.c
index cfc98f631e..77b4b0f0f7 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -3293,14 +3293,13 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_NIGHTOPIANHELPER9",
// Nightopian
- "S_PIAN0",
- "S_PIAN1",
- "S_PIAN2",
- "S_PIAN3",
- "S_PIAN4",
- "S_PIAN5",
- "S_PIAN6",
- "S_PIANSING",
+ "S_PIAN_LOOK1",
+ "S_PIAN_LOOK2",
+ "S_PIAN_LOOK3",
+ "S_PIAN_FLY1",
+ "S_PIAN_FLY2",
+ "S_PIAN_FLY3",
+ "S_PIAN_SING",
// Shleep
"S_SHLEEP1",
diff --git a/src/info.c b/src/info.c
index eed919b6cb..a26cc2d865 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3736,14 +3736,13 @@ state_t states[NUMSTATES] =
{SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER9
// Nightopian
- {SPR_NTPN, 0, 4, {A_Look}, 0, 0, S_PIAN0}, // S_PIAN0
- {SPR_NTPN, 0, 4, {A_JetgThink}, 0, 0, S_PIAN2}, // S_PIAN1
- {SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN3}, // S_PIAN2
- {SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN4}, // S_PIAN3
- {SPR_NTPN, 3, 4, {NULL}, 0, 0, S_PIAN5}, // S_PIAN4
- {SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN6}, // S_PIAN5
- {SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN1}, // S_PIAN6
- {SPR_NTPN, 4|FF_ANIMATE, 24, {NULL}, 1, 4, S_PIAN1}, // S_PIANSING
+ {SPR_NTPN, 0, 2, {A_Look}, 1, 1, S_PIAN_LOOK2}, // S_PIAN_LOOK1
+ {SPR_NTPN, 1, 2, {A_Look}, 1, 1, S_PIAN_LOOK3}, // S_PIAN_LOOK1
+ {SPR_NTPN, 2, 2, {A_Look}, 1, 1, S_PIAN_LOOK1}, // S_PIAN_LOOK1
+ {SPR_NTPN, 0, 2, {A_JetgThink}, 0, 0, S_PIAN_FLY2}, // S_PIAN_FLY1
+ {SPR_NTPN, 1, 2, {NULL}, 0, 0, S_PIAN_FLY3}, // S_PIAN_FLY2
+ {SPR_NTPN, 2, 2, {NULL}, 0, 0, S_PIAN_FLY1}, // S_PIAN_FLY3
+ {SPR_NTPN, 3|FF_ANIMATE, 24, {NULL}, 2, 2, S_PIAN_FLY1}, // S_PIANSING
// Shleep
{SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2}, // S_SHLEEP1
@@ -20119,9 +20118,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_PIAN
1602, // doomednum
- S_PIAN0, // spawnstate
+ S_PIAN_LOOK1, // spawnstate
1000, // spawnhealth
- S_PIAN1, // seestate
+ S_PIAN_FLY1, // seestate
sfx_None, // seesound
0, // reactiontime
sfx_None, // attacksound
@@ -20129,7 +20128,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
200, // painchance
sfx_None, // painsound
S_NULL, // meleestate
- S_PIANSING, // missilestate
+ S_PIAN_SING, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
@@ -20140,7 +20139,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16, // mass
0, // damage
sfx_None, // activesound
- MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY, // flags
+ MF_SLIDEME|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
diff --git a/src/info.h b/src/info.h
index 031a08b431..4f7c962bfd 100644
--- a/src/info.h
+++ b/src/info.h
@@ -4093,14 +4093,13 @@ typedef enum state
S_NIGHTOPIANHELPER9,
// Nightopian
- S_PIAN0,
- S_PIAN1,
- S_PIAN2,
- S_PIAN3,
- S_PIAN4,
- S_PIAN5,
- S_PIAN6,
- S_PIANSING,
+ S_PIAN_LOOK1,
+ S_PIAN_LOOK2,
+ S_PIAN_LOOK3,
+ S_PIAN_FLY1,
+ S_PIAN_FLY2,
+ S_PIAN_FLY3,
+ S_PIAN_SING,
// Shleep
S_SHLEEP1,
--
GitLab