From ac3924c9c82d809c5f3810717d230cdd566f0856 Mon Sep 17 00:00:00 2001 From: lachwright Date: Thu, 21 Nov 2019 01:05:22 +0800 Subject: [PATCH 1/3] Add GFZ debris; reorganize wood debris index --- src/dehacked.c | 7 ++-- src/info.c | 101 +++++++++++++++++++++++++++++++------------------ src/info.h | 11 +++--- 3 files changed, 74 insertions(+), 45 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 45148d712..4b5640c02 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7669,8 +7669,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_DUST3", "S_DUST4", - "S_WOODDEBRIS", - "S_ROCKSPAWN", "S_ROCKCRUMBLEA", @@ -7689,7 +7687,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_ROCKCRUMBLEN", "S_ROCKCRUMBLEO", "S_ROCKCRUMBLEP", + "S_GFZDEBRIS", "S_BRICKDEBRIS", + "S_WOODDEBRIS", #ifdef SEENAMES "S_NAMECHECK", @@ -8445,7 +8445,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_EXPLODE", // Robot Explosion "MT_UWEXPLODE", // Underwater Explosion "MT_DUST", - "MT_WOODDEBRIS", "MT_ROCKSPAWNER", "MT_FALLINGROCK", "MT_ROCKCRUMBLE1", @@ -8464,7 +8463,9 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_ROCKCRUMBLE14", "MT_ROCKCRUMBLE15", "MT_ROCKCRUMBLE16", + "MT_GFZDEBRIS", "MT_BRICKDEBRIS", + "MT_WOODDEBRIS", #ifdef SEENAMES "MT_NAMECHECK", diff --git a/src/info.c b/src/info.c index 50da228e5..fb74aba87 100644 --- a/src/info.c +++ b/src/info.c @@ -3883,8 +3883,6 @@ state_t states[NUMSTATES] = {SPR_DUST, 2|FF_TRANS60, 3, {NULL}, 0, 0, S_DUST4}, // S_DUST3 {SPR_DUST, 3|FF_TRANS70, 2, {NULL}, 0, 0, S_NULL}, // S_DUST4 - {SPR_WDDB, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL}, // S_WOODDEBRIS - {SPR_NULL, 0, 1, {A_RockSpawn}, 0, 0, S_ROCKSPAWN}, // S_ROCKSPAWN {SPR_ROIA, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL}, // S_ROCKCRUMBLEA @@ -3904,7 +3902,9 @@ state_t states[NUMSTATES] = {SPR_ROIO, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL}, // S_ROCKCRUMBLEO {SPR_ROIP, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL}, // S_ROCKCRUMBLEP + {SPR_GFZD, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_GFZDEBRIS {SPR_BRIC, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL}, // S_BRICKDEBRIS + {SPR_WDDB, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL}, // S_WOODDEBRIS #ifdef SEENAMES {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK @@ -20960,33 +20960,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_WOODDEBRIS - -1, // doomednum - S_WOODDEBRIS, // spawnstate - 1, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 0, // 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 - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_wbreak, // activesound - MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags - S_NULL // raisestate - }, - { // MT_ROCKSPAWNER 1202, // doomednum S_ROCKSPAWN, // spawnstate @@ -21473,16 +21446,16 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_BRICKDEBRIS + { // MT_GFZDEBRIS -1, // doomednum - S_BRICKDEBRIS, // spawnstate - 1, // spawnhealth + S_GFZDEBRIS, // spawnstate + 1, // spawnhealth S_NULL, // seestate - sfx_None, // seesound + sfx_None, // seesound 0, // reactiontime sfx_None, // attacksound S_NULL, // painstate - 0, // painchance + 0, // painchance sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate @@ -21490,16 +21463,70 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 16*FRACUNIT, // radius + 32*FRACUNIT, // radius + 64*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_wbreak, // activesound + MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_BRICKDEBRIS + -1, // doomednum + S_BRICKDEBRIS, // spawnstate + 1, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 0, // 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 16*FRACUNIT, // height 0, // display offset - 100, // mass + 100, // mass 0, // damage - sfx_None, // activesound + sfx_None, // activesound MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags S_NULL // raisestate }, + { // MT_WOODDEBRIS + -1, // doomednum + S_WOODDEBRIS, // spawnstate + 1, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 0, // 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 + 16*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_wbreak, // activesound + MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags + S_NULL // raisestate + }, + #ifdef SEENAMES { // MT_NAMECHECK -1, // doomednum diff --git a/src/info.h b/src/info.h index e28a24ade..025ab55d2 100644 --- a/src/info.h +++ b/src/info.h @@ -3970,8 +3970,6 @@ typedef enum state S_DUST3, S_DUST4, - S_WOODDEBRIS, - S_ROCKSPAWN, S_ROCKCRUMBLEA, @@ -3991,8 +3989,10 @@ typedef enum state S_ROCKCRUMBLEO, S_ROCKCRUMBLEP, - // Bricks + // Level debris + S_GFZDEBRIS, S_BRICKDEBRIS, + S_WOODDEBRIS, #ifdef SEENAMES S_NAMECHECK, @@ -4768,7 +4768,6 @@ typedef enum mobj_type MT_EXPLODE, // Robot Explosion MT_UWEXPLODE, // Underwater Explosion MT_DUST, - MT_WOODDEBRIS, MT_ROCKSPAWNER, MT_FALLINGROCK, MT_ROCKCRUMBLE1, @@ -4788,8 +4787,10 @@ typedef enum mobj_type MT_ROCKCRUMBLE15, MT_ROCKCRUMBLE16, - // Bricks + // Level debris + MT_GFZDEBRIS, MT_BRICKDEBRIS, + MT_WOODDEBRIS, #ifdef SEENAMES MT_NAMECHECK, From c5d085d333ba64cf0f13ee8d6a835239c98028bd Mon Sep 17 00:00:00 2001 From: lachwright Date: Thu, 21 Nov 2019 01:14:24 +0800 Subject: [PATCH 2/3] Add missing GFZD spriteset --- src/hardware/hw_light.c | 5 +++-- src/info.c | 7 ++++--- src/info.h | 7 ++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c index 584c58463..4df71d145 100644 --- a/src/hardware/hw_light.c +++ b/src/hardware/hw_light.c @@ -586,7 +586,6 @@ light_t *t_lspr[NUMSPRITES] = &lspr[SUPERSPARK_L], // SPR_BOM3 &lspr[NOLIGHT], // SPR_BOM4 &lspr[REDBALL_L], // SPR_BMNB - &lspr[NOLIGHT], // SPR_WDDB // Crumbly rocks &lspr[NOLIGHT], // SPR_ROIA @@ -606,8 +605,10 @@ light_t *t_lspr[NUMSPRITES] = &lspr[NOLIGHT], // SPR_ROIO &lspr[NOLIGHT], // SPR_ROIP - // Bricks + // Level debris + &lspr[NOLIGHT], // SPR_GFZD &lspr[NOLIGHT], // SPR_BRIC + &lspr[NOLIGHT], // SPR_WDDB // Gravity Well Objects &lspr[NOLIGHT], // SPR_GWLG diff --git a/src/info.c b/src/info.c index fb74aba87..0a1911e5d 100644 --- a/src/info.c +++ b/src/info.c @@ -483,7 +483,6 @@ char sprnames[NUMSPRITES + 1][5] = "BOM3", // Boss Explosion 2 "BOM4", // Underwater Explosion "BMNB", // Mine Explosion - "WDDB", // Wood Debris // Crumbly rocks "ROIA", @@ -503,8 +502,10 @@ char sprnames[NUMSPRITES + 1][5] = "ROIO", "ROIP", - // Bricks - "BRIC", + // Level debris + "GFZD", // GFZ debris + "BRIC", // Bricks + "WDDB", // Wood Debris // Gravity Well Objects "GWLG", diff --git a/src/info.h b/src/info.h index 025ab55d2..102610336 100644 --- a/src/info.h +++ b/src/info.h @@ -748,7 +748,6 @@ typedef enum sprite SPR_BOM3, // Boss Explosion 2 SPR_BOM4, // Underwater Explosion SPR_BMNB, // Mine Explosion - SPR_WDDB, // Wood Debris // Crumbly rocks SPR_ROIA, @@ -768,8 +767,10 @@ typedef enum sprite SPR_ROIO, SPR_ROIP, - // Bricks - SPR_BRIC, + // Level debris + SPR_GFZD, // GFZ debris + SPR_BRIC, // Bricks + SPR_WDDB, // Wood Debris // Gravity Well Objects SPR_GWLG, From 35f2572e29acb065b0ea3f227045b479cb243bc0 Mon Sep 17 00:00:00 2001 From: lachwright Date: Thu, 21 Nov 2019 01:26:53 +0800 Subject: [PATCH 3/3] Correct sound for GFZ debris (copy-paste oversight) --- src/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/info.c b/src/info.c index 0a1911e5d..691fb5616 100644 --- a/src/info.c +++ b/src/info.c @@ -21469,7 +21469,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // display offset 100, // mass 0, // damage - sfx_wbreak, // activesound + sfx_crumbl, // activesound MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags S_NULL // raisestate },