From 97a6f786a395a50d3d8bc9bf3eec164e6acb853f Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Wed, 25 Jan 2017 14:52:36 +0000
Subject: [PATCH] De-meming.
---
src/dehacked.c | 16 ++++++++--------
src/info.c | 24 ++++++++++++------------
src/info.h | 16 ++++++++--------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index 629224c772..c71c55ac1f 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -5380,10 +5380,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_BSZVINE_ORANGE",
"S_BSZSHRUB",
"S_BSZCLOVER",
- "S_ALOLAN_EGGSECUTOR_NECK",
- "S_ALOLAN_EGGSECUTOR_HEAD",
- "S_EGGSECUTOR_NECK",
- "S_EGGSECUTOR_HEAD",
+ "S_BIG_PALMTREE_TRUNK",
+ "S_BIG_PALMTREE_TOP",
+ "S_PALMTREE_TRUNK",
+ "S_PALMTREE_TOP",
"S_DBALL1",
"S_DBALL2",
@@ -6658,10 +6658,10 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_BSZVINE_ORANGE",
"MT_BSZSHRUB",
"MT_BSZCLOVER",
- "MT_ALOLAN_EGGSECUTOR_NECK",
- "MT_ALOLAN_EGGSECUTOR_HEAD",
- "MT_EGGSECUTOR_NECK",
- "MT_EGGSECUTOR_HEAD",
+ "MT_BIG_PALMTREE_TRUNK",
+ "MT_BIG_PALMTREE_TOP",
+ "MT_PALMTREE_TRUNK",
+ "MT_PALMTREE_TOP",
// Misc scenery
"MT_DBALL",
diff --git a/src/info.c b/src/info.c
index 9656030d15..fdea617c15 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1984,10 +1984,10 @@ state_t states[NUMSTATES] =
{SPR_BSZ7, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_ORANGE
{SPR_BSZ8, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHRUB
{SPR_BSZ8, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLOVER
- {SPR_BSZ8, 2, -1, {NULL}, 0, 0, S_NULL}, // S_ALOLAN_EGGSECUTOR_NECK
- {SPR_BSZ8, 3, -1, {NULL}, 0, 0, S_NULL}, // S_ALOLAN_EGGSECUTOR_HEAD
- {SPR_BSZ8, 4, -1, {NULL}, 0, 0, S_NULL}, // S_EGGSECUTOR_NECK
- {SPR_BSZ8, 5, -1, {NULL}, 0, 0, S_NULL}, // S_EGGSECUTOR_HEAD
+ {SPR_BSZ8, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BIG_PALMTREE_TRUNK
+ {SPR_BSZ8, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BIG_PALMTREE_TOP
+ {SPR_BSZ8, 4, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE_TRUNK
+ {SPR_BSZ8, 5, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE_TOP
// Disco ball
{SPR_DBAL, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_DBALL2}, // S_DBALL1
@@ -10716,9 +10716,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_ALOLAN_EGGSECUTOR_NECK
+ { // MT_BIG_PALMTREE_TRUNK
1472, // doomednum
- S_ALOLAN_EGGSECUTOR_NECK, // spawnstate
+ S_BIG_PALMTREE_TRUNK, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10743,9 +10743,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_ALOLAN_EGGSECUTOR_HEAD
+ { // MT_BIG_PALMTREE_TOP
1473, // doomednum
- S_ALOLAN_EGGSECUTOR_HEAD, // spawnstate
+ S_BIG_PALMTREE_TOP, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10770,9 +10770,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_EGGSECUTOR_NECK
+ { // MT_PALMTREE_TRUNK
1474, // doomednum
- S_EGGSECUTOR_NECK, // spawnstate
+ S_PALMTREE_TRUNK, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10797,9 +10797,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_EGGSECUTOR_HEAD
+ { // MT_PALMTREE_TOP
1475, // doomednum
- S_EGGSECUTOR_HEAD, // spawnstate
+ S_PALMTREE_TOP, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
diff --git a/src/info.h b/src/info.h
index f505643726..1a6c14a705 100644
--- a/src/info.h
+++ b/src/info.h
@@ -2185,10 +2185,10 @@ typedef enum state
S_BSZVINE_ORANGE,
S_BSZSHRUB,
S_BSZCLOVER,
- S_ALOLAN_EGGSECUTOR_NECK,
- S_ALOLAN_EGGSECUTOR_HEAD,
- S_EGGSECUTOR_NECK,
- S_EGGSECUTOR_HEAD,
+ S_BIG_PALMTREE_TRUNK,
+ S_BIG_PALMTREE_TOP,
+ S_PALMTREE_TRUNK,
+ S_PALMTREE_TOP,
S_DBALL1,
S_DBALL2,
@@ -3482,10 +3482,10 @@ typedef enum mobj_type
MT_BSZVINE_ORANGE,
MT_BSZSHRUB,
MT_BSZCLOVER,
- MT_ALOLAN_EGGSECUTOR_NECK,
- MT_ALOLAN_EGGSECUTOR_HEAD,
- MT_EGGSECUTOR_NECK,
- MT_EGGSECUTOR_HEAD,
+ MT_BIG_PALMTREE_TRUNK,
+ MT_BIG_PALMTREE_TOP,
+ MT_PALMTREE_TRUNK,
+ MT_PALMTREE_TOP,
// Misc scenery
MT_DBALL,
--
GitLab