Merge branch 'cezbricks' into 'master'
Hardcode CEZ brick debris See merge request STJr/SRB2Internal!247
This commit is contained in:
commit
c5ecb392b3
|
@ -7167,6 +7167,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
"S_ROCKCRUMBLEN",
|
"S_ROCKCRUMBLEN",
|
||||||
"S_ROCKCRUMBLEO",
|
"S_ROCKCRUMBLEO",
|
||||||
"S_ROCKCRUMBLEP",
|
"S_ROCKCRUMBLEP",
|
||||||
|
"S_BRICKDEBRIS",
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
"S_NAMECHECK",
|
"S_NAMECHECK",
|
||||||
|
@ -7881,6 +7882,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
|
||||||
"MT_ROCKCRUMBLE14",
|
"MT_ROCKCRUMBLE14",
|
||||||
"MT_ROCKCRUMBLE15",
|
"MT_ROCKCRUMBLE15",
|
||||||
"MT_ROCKCRUMBLE16",
|
"MT_ROCKCRUMBLE16",
|
||||||
|
"MT_BRICKDEBRIS",
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
"MT_NAMECHECK",
|
"MT_NAMECHECK",
|
||||||
|
|
|
@ -580,6 +580,9 @@ light_t *t_lspr[NUMSPRITES] =
|
||||||
&lspr[NOLIGHT], // SPR_ROIO
|
&lspr[NOLIGHT], // SPR_ROIO
|
||||||
&lspr[NOLIGHT], // SPR_ROIP
|
&lspr[NOLIGHT], // SPR_ROIP
|
||||||
|
|
||||||
|
// Bricks
|
||||||
|
&lspr[NOLIGHT], // SPR_BRIC
|
||||||
|
|
||||||
// Gravity Well Objects
|
// Gravity Well Objects
|
||||||
&lspr[NOLIGHT], // SPR_GWLG
|
&lspr[NOLIGHT], // SPR_GWLG
|
||||||
&lspr[NOLIGHT], // SPR_GWLR
|
&lspr[NOLIGHT], // SPR_GWLR
|
||||||
|
|
32
src/info.c
32
src/info.c
|
@ -475,6 +475,9 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"ROIO",
|
"ROIO",
|
||||||
"ROIP",
|
"ROIP",
|
||||||
|
|
||||||
|
// Bricks
|
||||||
|
"BRIC",
|
||||||
|
|
||||||
// Gravity Well Objects
|
// Gravity Well Objects
|
||||||
"GWLG",
|
"GWLG",
|
||||||
"GWLR",
|
"GWLR",
|
||||||
|
@ -3861,6 +3864,8 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_ROIO, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL}, // S_ROCKCRUMBLEO
|
{SPR_ROIO, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL}, // S_ROCKCRUMBLEO
|
||||||
{SPR_ROIP, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL}, // S_ROCKCRUMBLEP
|
{SPR_ROIP, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL}, // S_ROCKCRUMBLEP
|
||||||
|
|
||||||
|
{SPR_BRIC, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL}, // S_BRICKDEBRIS
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
|
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
|
||||||
#endif
|
#endif
|
||||||
|
@ -19970,6 +19975,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_NULL // raisestate
|
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
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
{ // MT_NAMECHECK
|
{ // MT_NAMECHECK
|
||||||
-1, // doomednum
|
-1, // doomednum
|
||||||
|
|
|
@ -720,6 +720,9 @@ typedef enum sprite
|
||||||
SPR_ROIO,
|
SPR_ROIO,
|
||||||
SPR_ROIP,
|
SPR_ROIP,
|
||||||
|
|
||||||
|
// Bricks
|
||||||
|
SPR_BRIC,
|
||||||
|
|
||||||
// Gravity Well Objects
|
// Gravity Well Objects
|
||||||
SPR_GWLG,
|
SPR_GWLG,
|
||||||
SPR_GWLR,
|
SPR_GWLR,
|
||||||
|
@ -3923,6 +3926,9 @@ typedef enum state
|
||||||
S_ROCKCRUMBLEO,
|
S_ROCKCRUMBLEO,
|
||||||
S_ROCKCRUMBLEP,
|
S_ROCKCRUMBLEP,
|
||||||
|
|
||||||
|
// Bricks
|
||||||
|
S_BRICKDEBRIS,
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
S_NAMECHECK,
|
S_NAMECHECK,
|
||||||
#endif
|
#endif
|
||||||
|
@ -4657,6 +4663,9 @@ typedef enum mobj_type
|
||||||
MT_ROCKCRUMBLE15,
|
MT_ROCKCRUMBLE15,
|
||||||
MT_ROCKCRUMBLE16,
|
MT_ROCKCRUMBLE16,
|
||||||
|
|
||||||
|
// Bricks
|
||||||
|
MT_BRICKDEBRIS,
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
MT_NAMECHECK,
|
MT_NAMECHECK,
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -7309,6 +7309,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
case MT_ROCKCRUMBLE15:
|
case MT_ROCKCRUMBLE15:
|
||||||
case MT_ROCKCRUMBLE16:
|
case MT_ROCKCRUMBLE16:
|
||||||
case MT_WOODDEBRIS:
|
case MT_WOODDEBRIS:
|
||||||
|
case MT_BRICKDEBRIS:
|
||||||
if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
|
if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
|
||||||
&& mobj->state != &states[mobj->info->deathstate])
|
&& mobj->state != &states[mobj->info->deathstate])
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue