stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'stars-fix' into 'next'

Browse source 
Add MT_FLINGNIGHTSSTAR mobj type

See merge request STJr/SRB2!663
This commit is contained in:
MascaraSnake 2020-01-10 13:34:43 -05:00
commit e532efa5d0
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -8669,6 +8669,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_NIGHTSCHIP", // NiGHTS Chip "MT_NIGHTSCHIP", // NiGHTS Chip
"MT_FLINGNIGHTSCHIP", // Lost NiGHTS Chip "MT_FLINGNIGHTSCHIP", // Lost NiGHTS Chip
"MT_NIGHTSSTAR", // NiGHTS Star "MT_NIGHTSSTAR", // NiGHTS Star
"MT_FLINGNIGHTSSTAR", // Lost NiGHTS Star
"MT_NIGHTSSUPERLOOP", "MT_NIGHTSSUPERLOOP",
"MT_NIGHTSDRILLREFILL", "MT_NIGHTSDRILLREFILL",
"MT_NIGHTSHELPER", "MT_NIGHTSHELPER",

35
src/info.c
View file

@ -19760,14 +19760,14 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_FLINGNIGHTSCHIP { // MT_FLINGNIGHTSCHIP
-1, // doomednum -1, // doomednum
S_NIGHTSCHIP, // spawnstate S_NIGHTSCHIP, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_None, // seesound
MT_FLINGNIGHTSCHIP, // reactiontime MT_FLINGNIGHTSCHIP, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
MT_NIGHTSCHIP, // painchance MT_NIGHTSCHIP, // painchance
sfx_None, // painsound sfx_None, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_NULL, // missilestate S_NULL, // missilestate
@ -19791,7 +19791,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
1000, // spawnhealth 1000, // spawnhealth
S_NIGHTSSTARXMAS, // seestate S_NIGHTSSTARXMAS, // seestate
sfx_None, // seesound sfx_None, // seesound
8, // reactiontime MT_FLINGNIGHTSSTAR, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
0, // painchance 0, // painchance
@ -19811,6 +19811,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_FLINGNIGHTSSTAR
-1, // doomednum
S_NIGHTSSTAR, // spawnstate
1000, // spawnhealth
S_NIGHTSSTARXMAS, // seestate
sfx_None, // seesound
MT_FLINGNIGHTSSTAR, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
MT_NIGHTSSTAR, // painchance
sfx_s3k33, // painsound
S_RING, // meleestate
S_NULL, // missilestate
S_SPRK1, // deathstate
S_NULL, // xdeathstate
sfx_ncitem, // deathsound
38*FRACUNIT, // speed
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
MF_SLIDEME|MF_SPECIAL, // flags
S_NULL // raisestate
},
{ // MT_NIGHTSSUPERLOOP { // MT_NIGHTSSUPERLOOP
1707, // doomednum 1707, // doomednum

1
src/info.h
View file

@ -4702,6 +4702,7 @@ typedef enum mobj_type
MT_NIGHTSCHIP, // NiGHTS Chip MT_NIGHTSCHIP, // NiGHTS Chip
MT_FLINGNIGHTSCHIP, // Lost NiGHTS Chip MT_FLINGNIGHTSCHIP, // Lost NiGHTS Chip
MT_NIGHTSSTAR, // NiGHTS Star MT_NIGHTSSTAR, // NiGHTS Star
MT_FLINGNIGHTSSTAR, // Lost NiGHTS Star
MT_NIGHTSSUPERLOOP, MT_NIGHTSSUPERLOOP,
MT_NIGHTSDRILLREFILL, MT_NIGHTSDRILLREFILL,
MT_NIGHTSHELPER, MT_NIGHTSHELPER,