Commit bfa13827 by Zolton Auburn

New Debris for CEZ3

parent 70eb5ba6
......@@ -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",
......
......@@ -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
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment