From bfa13827362d67220d864aa1ddef677867305603 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Mon, 8 Jun 2020 19:16:10 -0500 Subject: [PATCH 1/3] New Debris for CEZ3 --- src/dehacked.c | 10 ++++-- src/info.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/info.h | 9 ++++++ 3 files changed, 104 insertions(+), 2 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 8450c16e6..77a539636 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -392,7 +392,7 @@ static void readPlayer(MYFILE *f, INT32 num) // It works down here, though. { INT32 numline = 0; - for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++) + for (i = 0; i < MAXLINELEN-1; i++) { if (numline < 20 && description[num].notes[i] == '\n') numline++; @@ -1174,7 +1174,7 @@ static void readgametype(MYFILE *f, char *gtname) // It works down here, though. { INT32 numline = 0; - for (i = 0; (size_t)i < sizeof(gtdescription)-1; i++) + for (i = 0; i < MAXLINELEN-1; i++) { if (numline < 20 && gtdescription[i] == '\n') numline++; @@ -8007,6 +8007,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_GFZDEBRIS", "S_BRICKDEBRIS", "S_WOODDEBRIS", + "S_COLOREDBRICKDEBRISA", + "S_COLOREDBRICKDEBRISB", + "S_COLOREDBRICKDEBRISC", #ifdef SEENAMES "S_NAMECHECK", @@ -8787,6 +8790,9 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_GFZDEBRIS", "MT_BRICKDEBRIS", "MT_WOODDEBRIS", + "MT_COLOREDBRICKDEBRISA", + "MT_COLOREDBRICKDEBRISB", + "MT_COLOREDBRICKDEBRISC", #ifdef SEENAMES "MT_NAMECHECK", diff --git a/src/info.c b/src/info.c index d443e035d..a0f91cbb4 100644 --- a/src/info.c +++ b/src/info.c @@ -509,6 +509,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", @@ -3910,6 +3913,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_COLOREDBRICKDEBRISA + {SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISB + {SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISC #ifdef SEENAMES {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK @@ -21586,6 +21592,87 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_COLOREDBRICKDEBRISA + -1, // doomednum + S_COLOREDBRICKDEBRISA, // 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_COLOREDBRICKDEBRISB + -1, // doomednum + S_COLOREDBRICKDEBRISB, // 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_COLOREDBRICKDEBRISC + -1, // doomednum + S_COLOREDBRICKDEBRISC, // 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 79af9bbbb..67f4e1610 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, @@ -3998,6 +4001,9 @@ typedef enum state S_GFZDEBRIS, S_BRICKDEBRIS, S_WOODDEBRIS, + S_COLOREDBRICKDEBRISA, // for CEZ3 + S_COLOREDBRICKDEBRISB, // for CEZ3 + S_COLOREDBRICKDEBRISC, // for CEZ3 #ifdef SEENAMES S_NAMECHECK, @@ -4798,6 +4804,9 @@ typedef enum mobj_type MT_GFZDEBRIS, MT_BRICKDEBRIS, MT_WOODDEBRIS, + MT_COLOREDBRICKDEBRISA, // for CEZ3 + MT_COLOREDBRICKDEBRISB, // for CEZ3 + MT_COLOREDBRICKDEBRISC, // for CEZ3 #ifdef SEENAMES MT_NAMECHECK, From fc68134938e4c0f3208769ac2c232db59cd17d24 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Sat, 20 Jun 2020 02:04:18 -0500 Subject: [PATCH 2/3] Thanks for the feedback, I have fixed your issues. --- src/dehacked.c | 16 ++++++++-------- src/info.c | 18 +++++++++--------- src/info.h | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 77a539636..610980812 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -392,7 +392,7 @@ static void readPlayer(MYFILE *f, INT32 num) // It works down here, though. { INT32 numline = 0; - for (i = 0; i < MAXLINELEN-1; i++) + for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++) { if (numline < 20 && description[num].notes[i] == '\n') numline++; @@ -1174,7 +1174,7 @@ static void readgametype(MYFILE *f, char *gtname) // It works down here, though. { INT32 numline = 0; - for (i = 0; i < MAXLINELEN-1; i++) + for (i = 0; (size_t)i < sizeof(gtdescription)-1; i++) { if (numline < 20 && gtdescription[i] == '\n') numline++; @@ -8007,9 +8007,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_GFZDEBRIS", "S_BRICKDEBRIS", "S_WOODDEBRIS", - "S_COLOREDBRICKDEBRISA", - "S_COLOREDBRICKDEBRISB", - "S_COLOREDBRICKDEBRISC", + "S_REDBRICKDEBRIS", + "S_BLUEBRICKDEBRIS", + "S_YELLOWBRICKDEBRIS", #ifdef SEENAMES "S_NAMECHECK", @@ -8790,9 +8790,9 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_GFZDEBRIS", "MT_BRICKDEBRIS", "MT_WOODDEBRIS", - "MT_COLOREDBRICKDEBRISA", - "MT_COLOREDBRICKDEBRISB", - "MT_COLOREDBRICKDEBRISC", + "MT_REDBRICKDEBRIS", + "MT_BLUEBRICKDEBRIS", + "MT_YELLOWBRICKDEBRIS", #ifdef SEENAMES "MT_NAMECHECK", diff --git a/src/info.c b/src/info.c index a0f91cbb4..ef31af9a6 100644 --- a/src/info.c +++ b/src/info.c @@ -3913,9 +3913,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_COLOREDBRICKDEBRISA - {SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISB - {SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISC + {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 @@ -21592,9 +21592,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_COLOREDBRICKDEBRISA + { // MT_REDBRICKDEBRIS -1, // doomednum - S_COLOREDBRICKDEBRISA, // spawnstate + S_REDBRICKDEBRIS, // spawnstate 1, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -21619,9 +21619,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_COLOREDBRICKDEBRISB + { // MT_BLUEBRICKDEBRIS -1, // doomednum - S_COLOREDBRICKDEBRISB, // spawnstate + S_BLUEBRICKDEBRIS, // spawnstate 1, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -21646,9 +21646,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_COLOREDBRICKDEBRISC + { // MT_YELLOWBRICKDEBRIS -1, // doomednum - S_COLOREDBRICKDEBRISC, // spawnstate + S_YELLOWBRICKDEBRIS, // spawnstate 1, // spawnhealth S_NULL, // seestate sfx_None, // seesound diff --git a/src/info.h b/src/info.h index 67f4e1610..fac690693 100644 --- a/src/info.h +++ b/src/info.h @@ -4001,9 +4001,9 @@ typedef enum state S_GFZDEBRIS, S_BRICKDEBRIS, S_WOODDEBRIS, - S_COLOREDBRICKDEBRISA, // for CEZ3 - S_COLOREDBRICKDEBRISB, // for CEZ3 - S_COLOREDBRICKDEBRISC, // for CEZ3 + S_REDBRICKDEBRIS, // for CEZ3 + S_BLUEBRICKDEBRIS, // for CEZ3 + S_YELLOWBRICKDEBRIS, // for CEZ3 #ifdef SEENAMES S_NAMECHECK, @@ -4804,9 +4804,9 @@ typedef enum mobj_type MT_GFZDEBRIS, MT_BRICKDEBRIS, MT_WOODDEBRIS, - MT_COLOREDBRICKDEBRISA, // for CEZ3 - MT_COLOREDBRICKDEBRISB, // for CEZ3 - MT_COLOREDBRICKDEBRISC, // for CEZ3 + MT_REDBRICKDEBRIS, // for CEZ3 + MT_BLUEBRICKDEBRIS, // for CEZ3 + MT_YELLOWBRICKDEBRIS, // for CEZ3 #ifdef SEENAMES MT_NAMECHECK, From ca7fc22388c2451c68f9fe780795de19a6b68a66 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Sat, 20 Jun 2020 14:16:22 -0500 Subject: [PATCH 3/3] t_lspr --- src/hardware/hw_light.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c index 3d1316a2f..1f6b5525d 100644 --- a/src/hardware/hw_light.c +++ b/src/hardware/hw_light.c @@ -611,6 +611,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