diff --git a/src/dehacked.c b/src/dehacked.c index a541509a1..19c54016f 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -8148,6 +8148,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_GFZDEBRIS", "S_BRICKDEBRIS", "S_WOODDEBRIS", + "S_REDBRICKDEBRIS", + "S_BLUEBRICKDEBRIS", + "S_YELLOWBRICKDEBRIS", #ifdef SEENAMES "S_NAMECHECK", @@ -8928,6 +8931,9 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_GFZDEBRIS", "MT_BRICKDEBRIS", "MT_WOODDEBRIS", + "MT_REDBRICKDEBRIS", + "MT_BLUEBRICKDEBRIS", + "MT_YELLOWBRICKDEBRIS", #ifdef SEENAMES "MT_NAMECHECK", diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c index b2139d5ee..a685994cc 100644 --- a/src/hardware/hw_light.c +++ b/src/hardware/hw_light.c @@ -605,6 +605,9 @@ light_t *t_lspr[NUMSPRITES] = &lspr[NOLIGHT], // SPR_GFZD &lspr[NOLIGHT], // SPR_BRIC &lspr[NOLIGHT], // SPR_WDDB + &lspr[NOLIGHT], // SPR_BRIR + &lspr[NOLIGHT], // SPR_BRIB + &lspr[NOLIGHT], // SPR_BRIY // Gravity Well Objects &lspr[NOLIGHT], // SPR_GWLG diff --git a/src/info.c b/src/info.c index df8646606..ff0569f50 100644 --- a/src/info.c +++ b/src/info.c @@ -510,6 +510,9 @@ char sprnames[NUMSPRITES + 1][5] = "GFZD", // GFZ debris "BRIC", // Bricks "WDDB", // Wood Debris + "BRIR", // CEZ3 colored bricks + "BRIB", // CEZ3 colored bricks + "BRIY", // CEZ3 colored bricks // Gravity Well Objects "GWLG", @@ -3913,6 +3916,9 @@ state_t states[NUMSTATES] = {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 + {SPR_BRIR, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_REDBRICKDEBRIS + {SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_BLUEBRICKDEBRIS + {SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_YELLOWBRICKDEBRIS #ifdef SEENAMES {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK @@ -21589,6 +21595,87 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_REDBRICKDEBRIS + -1, // doomednum + S_REDBRICKDEBRIS, // 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 + 32*FRACUNIT, // radius + 64*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_crumbl, // activesound + MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_BLUEBRICKDEBRIS + -1, // doomednum + S_BLUEBRICKDEBRIS, // 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 + 32*FRACUNIT, // radius + 64*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_crumbl, // activesound + MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_YELLOWBRICKDEBRIS + -1, // doomednum + S_YELLOWBRICKDEBRIS, // 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 + 32*FRACUNIT, // radius + 64*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_crumbl, // 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 476ad2b73..6082c4250 100644 --- a/src/info.h +++ b/src/info.h @@ -774,6 +774,9 @@ typedef enum sprite SPR_GFZD, // GFZ debris SPR_BRIC, // Bricks SPR_WDDB, // Wood Debris + SPR_BRIR, // CEZ3 colored bricks + SPR_BRIB, + SPR_BRIY, // Gravity Well Objects SPR_GWLG, @@ -4000,6 +4003,9 @@ typedef enum state S_GFZDEBRIS, S_BRICKDEBRIS, S_WOODDEBRIS, + S_REDBRICKDEBRIS, // for CEZ3 + S_BLUEBRICKDEBRIS, // for CEZ3 + S_YELLOWBRICKDEBRIS, // for CEZ3 #ifdef SEENAMES S_NAMECHECK, @@ -4800,6 +4806,9 @@ typedef enum mobj_type MT_GFZDEBRIS, MT_BRICKDEBRIS, MT_WOODDEBRIS, + MT_REDBRICKDEBRIS, // for CEZ3 + MT_BLUEBRICKDEBRIS, // for CEZ3 + MT_YELLOWBRICKDEBRIS, // for CEZ3 #ifdef SEENAMES MT_NAMECHECK,