From 0e358b3d9fdbb2426abce44078f6ee99792d39cc Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 18 Apr 2017 17:36:04 +0100
Subject: [PATCH] Add new Pity shield orb state info, remove unused Pity states
---
src/dehacked.c | 4 ----
src/info.c | 16 ++++++----------
src/info.h | 4 ----
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index 32b1c1ca30..8eb248baa0 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -5530,10 +5530,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_PITY4",
"S_PITY5",
"S_PITY6",
- "S_PITY7",
- "S_PITY8",
- "S_PITY9",
- "S_PITY10",
"S_FIRS1",
"S_FIRS2",
diff --git a/src/info.c b/src/info.c
index 7d6e1feded..1d807ac1ad 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2122,16 +2122,12 @@ state_t states[NUMSTATES] =
{SPR_ELEM, FF_FULLBRIGHT|20, 1, {NULL}, 0, 0, S_ELEMF10}, // S_ELEMF9
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_ELEMF1 }, // S_ELEMF10
- {SPR_PITY, FF_TRANS20 , 1, {NULL}, 0, 0, S_PITY2 }, // S_PITY1
- {SPR_PITY, FF_TRANS20|1, 1, {NULL}, 0, 0, S_PITY3 }, // S_PITY2
- {SPR_PITY, FF_TRANS20 , 1, {NULL}, 0, 0, S_PITY4 }, // S_PITY3
- {SPR_PITY, FF_TRANS20|2, 1, {NULL}, 0, 0, S_PITY5 }, // S_PITY4
- {SPR_PITY, FF_TRANS20 , 1, {NULL}, 0, 0, S_PITY6 }, // S_PITY5
- {SPR_PITY, FF_TRANS20|3, 1, {NULL}, 0, 0, S_PITY7 }, // S_PITY6
- {SPR_PITY, FF_TRANS20 , 1, {NULL}, 0, 0, S_PITY8 }, // S_PITY7
- {SPR_PITY, FF_TRANS20|4, 1, {NULL}, 0, 0, S_PITY9 }, // S_PITY8
- {SPR_PITY, FF_TRANS20 , 1, {NULL}, 0, 0, S_PITY10}, // S_PITY9
- {SPR_PITY, FF_TRANS20|5, 1, {NULL}, 0, 0, S_PITY1 }, // S_PITY10
+ {SPR_PITY, FF_TRANS30 , 2, {NULL}, 0, 0, S_PITY2}, // S_PITY1
+ {SPR_PITY, FF_TRANS30|1, 2, {NULL}, 0, 0, S_PITY3}, // S_PITY2
+ {SPR_PITY, FF_TRANS30|2, 2, {NULL}, 0, 0, S_PITY4}, // S_PITY3
+ {SPR_PITY, FF_TRANS20|3, 2, {NULL}, 0, 0, S_PITY5}, // S_PITY4
+ {SPR_PITY, FF_TRANS30|4, 2, {NULL}, 0, 0, S_PITY6}, // S_PITY5
+ {SPR_PITY, FF_TRANS20|5, 2, {NULL}, 0, 0, S_PITY1}, // S_PITY6
{SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40 , 2, {NULL}, 0, 0, S_FIRS2}, // S_FIRS1
{SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|1, 2, {NULL}, 0, 0, S_FIRS3}, // S_FIRS2
diff --git a/src/info.h b/src/info.h
index 4b21e98ec4..33bfcf19e6 100644
--- a/src/info.h
+++ b/src/info.h
@@ -2325,10 +2325,6 @@ typedef enum state
S_PITY4,
S_PITY5,
S_PITY6,
- S_PITY7,
- S_PITY8,
- S_PITY9,
- S_PITY10,
S_FIRS1,
S_FIRS2,
--
GitLab