From b34aa86403039ee9f6f3ce016f7fc6113a2a7201 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sat, 11 May 2019 22:56:23 -0400
Subject: [PATCH] Hardcode some ACZ things
---
src/dehacked.c | 18 ++++
src/hardware/hw_light.c | 3 +
src/info.c | 229 ++++++++++++++++++++++++++++++++++++++++
src/info.h | 21 ++++
4 files changed, 271 insertions(+)
diff --git a/src/dehacked.c b/src/dehacked.c
index 4f68c5062e..e98fbcdf2f 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -5568,6 +5568,16 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_CACTI2",
"S_CACTI3",
"S_CACTI4",
+ "S_CACTI5",
+ "S_CACTI6",
+ "S_CACTI7",
+ "S_CACTI8",
+ "S_CACTI9",
+
+ // Warning signs sprites
+ "S_ARIDSIGN_CAUTION",
+ "S_ARIDSIGN_CACTI",
+ "S_ARIDSIGN_SHARPTURN",
// Flame jet
"S_FLAMEJETSTND",
@@ -7241,6 +7251,14 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_CACTI2",
"MT_CACTI3",
"MT_CACTI4",
+ "MT_CACTI5",
+ "MT_CACTI6",
+ "MT_CACTI7",
+ "MT_CACTI8",
+ "MT_CACTI9",
+ "MT_ARIDSIGN_CAUTION",
+ "MT_ARIDSIGN_CACTI",
+ "MT_ARIDSIGN_SHARPTURN",
// Red Volcano Scenery
"MT_FLAMEJET",
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index dfb2c43518..2515c6a86a 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -343,6 +343,9 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_BTBL
&lspr[NOLIGHT], // SPR_STBL
&lspr[NOLIGHT], // SPR_CACT
+ &lspr[NOLIGHT], // SPR_WWSG
+ &lspr[NOLIGHT], // SPR_WWS2
+ &lspr[NOLIGHT], // SPR_WWS3
// Red Volcano Scenery
&lspr[REDBALL_L], // SPR_FLME
diff --git a/src/info.c b/src/info.c
index 86e40c3889..89ce485596 100644
--- a/src/info.c
+++ b/src/info.c
@@ -238,6 +238,9 @@ char sprnames[NUMSPRITES + 1][5] =
"BTBL", // Big tumbleweed
"STBL", // Small tumbleweed
"CACT", // Cacti sprites
+ "WWSG", // Caution Sign
+ "WWS2", // Cacti Sign
+ "WWS3", // Sharp Turn Sign
// Red Volcano Scenery
"FLME", // Flame jet
@@ -2188,6 +2191,16 @@ state_t states[NUMSTATES] =
{SPR_CACT, 1, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI2
{SPR_CACT, 2, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI3
{SPR_CACT, 3, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI4
+ {SPR_CACT, 4, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI5
+ {SPR_CACT, 5, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI6
+ {SPR_CACT, 6, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI7
+ {SPR_CACT, 7, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI8
+ {SPR_CACT, 8, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI9
+
+ // Warning Signs
+ {SPR_WWSG, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDSIGN_CAUTION
+ {SPR_WWS2, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDSIGN_CACTI
+ {SPR_WWS3, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDSIGN_SHARPTURN
// Flame jet
{SPR_NULL, 0, 2*TICRATE, {NULL}, 0, 0, S_FLAMEJETSTART}, // S_FLAMEJETSTND
@@ -10913,6 +10926,222 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_CACTI5
+ 1207, // doomednum
+ S_CACTI5, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 40*FRACUNIT, // radius
+ 128*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SOLID|MF_SCENERY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACTI6
+ 1208, // doomednum
+ S_CACTI6, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 24*FRACUNIT, // radius
+ 132*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SOLID|MF_SCENERY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACTI7
+ 1209, // doomednum
+ S_CACTI7, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 24*FRACUNIT, // radius
+ 224*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SOLID|MF_SCENERY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACTI8
+ 1210, // doomednum
+ S_CACTI8, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 24*FRACUNIT, // radius
+ 208*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SOLID|MF_SCENERY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACTI9
+ 1211, // doomednum
+ S_CACTI9, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 48*FRACUNIT, // radius
+ 208*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SOLID|MF_SCENERY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_ARIDSIGN_CAUTION
+ 1212, // doomednum
+ S_ARIDSIGN_CAUTION, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 22*FRACUNIT, // radius
+ 64*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SCENERY|MF_SOLID|MF_PAPERCOLLISION, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_ARIDSIGN_CACTI
+ 1213, // doomednum
+ S_ARIDSIGN_CACTI, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 22*FRACUNIT, // radius
+ 64*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SCENERY|MF_SOLID|MF_PAPERCOLLISION, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_ARIDSIGN_SHARPTURN
+ 1214, // doomednum
+ S_ARIDSIGN_SHARPTURN, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 16*FRACUNIT, // radius
+ 192*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SCENERY|MF_SOLID|MF_PAPERCOLLISION, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_FLAMEJET
1300, // doomednum
S_FLAMEJETSTND, // spawnstate
diff --git a/src/info.h b/src/info.h
index 962a6be29c..b63dae67c8 100644
--- a/src/info.h
+++ b/src/info.h
@@ -457,6 +457,9 @@ typedef enum sprite
SPR_BTBL, // Big tumbleweed
SPR_STBL, // Small tumbleweed
SPR_CACT, // Cacti sprites
+ SPR_WWSG, // Caution Sign
+ SPR_WWS2, // Cacti Sign
+ SPR_WWS3, // Sharp Turn Sign
// Red Volcano Scenery
SPR_FLME, // Flame jet
@@ -2306,6 +2309,16 @@ typedef enum state
S_CACTI2,
S_CACTI3,
S_CACTI4,
+ S_CACTI5,
+ S_CACTI6,
+ S_CACTI7,
+ S_CACTI8,
+ S_CACTI9,
+
+ // Warning signs sprites
+ S_ARIDSIGN_CAUTION,
+ S_ARIDSIGN_CACTI,
+ S_ARIDSIGN_SHARPTURN,
// Flame jet
S_FLAMEJETSTND,
@@ -3999,6 +4012,14 @@ typedef enum mobj_type
MT_CACTI2,
MT_CACTI3,
MT_CACTI4,
+ MT_CACTI5, // Harmful Cactus 1
+ MT_CACTI6, // Harmful Cactus 2
+ MT_CACTI7, // Harmful Cactus 3
+ MT_CACTI8, // Harmful Cactus 4
+ MT_CACTI9, // Harmful Cactus 5
+ MT_ARIDSIGN_CAUTION, // Caution Sign
+ MT_ARIDSIGN_CACTI, // Cacti Sign
+ MT_ARIDSIGN_SHARPTURN, // Sharp Turn Sign
// Red Volcano Scenery
MT_FLAMEJET,
--
GitLab