stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-08 01:02:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mt_ray' into 'next'

Browse source 
Move MT_RAY to the very end of the mobj list

See merge request STJr/SRB2!1747
This commit is contained in:
sphere 2022-02-28 15:13:09 +00:00
commit a57a0985ee
3 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deh_tables.c
View file

@ -3496,7 +3496,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
// because sadly no one remembers this place while searching for full state names. // because sadly no one remembers this place while searching for full state names.
const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity testing later. const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity testing later.
"MT_NULL", "MT_NULL",
"MT_RAY",
"MT_UNKNOWN", "MT_UNKNOWN",
"MT_THOK", // Thok! mobj "MT_THOK", // Thok! mobj
@ -4270,6 +4269,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
"MT_YELLOWBRICKDEBRIS", "MT_YELLOWBRICKDEBRIS",
"MT_NAMECHECK", "MT_NAMECHECK",
"MT_RAY",
}; };
const char *const MOBJFLAG_LIST[] = { const char *const MOBJFLAG_LIST[] = {

54
src/info.c
View file

@ -3964,33 +3964,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_RAY
-1, // doomednum
S_NULL, // spawnstate
0, // 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
0, // radius
0, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_UNKNOWN { // MT_UNKNOWN
-1, // doomednum -1, // doomednum
S_UNKNOWN, // spawnstate S_UNKNOWN, // spawnstate
@ -21712,6 +21685,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_NOSECTOR, // flags MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_NOSECTOR, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_RAY
-1, // doomednum
S_NULL, // spawnstate
0, // 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
0, // radius
0, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate
},
}; };
skincolor_t skincolors[MAXSKINCOLORS] = { skincolor_t skincolors[MAXSKINCOLORS] = {

2
src/info.h
View file

@ -4316,7 +4316,6 @@ extern playersprite_t free_spr2;
typedef enum mobj_type typedef enum mobj_type
{ {
MT_NULL, MT_NULL,
MT_RAY, // General purpose mobj
MT_UNKNOWN, MT_UNKNOWN,
MT_THOK, // Thok! mobj MT_THOK, // Thok! mobj
@ -5090,6 +5089,7 @@ typedef enum mobj_type
MT_YELLOWBRICKDEBRIS, // for CEZ3 MT_YELLOWBRICKDEBRIS, // for CEZ3
MT_NAMECHECK, MT_NAMECHECK,
MT_RAY, // General purpose mobj
MT_FIRSTFREESLOT, MT_FIRSTFREESLOT,
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1, MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,