stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-04 16:32:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

ORBITEM CENTER states for A_OrbitNights target height offset

Browse source
This commit is contained in:
mazmazz 2018-08-10 23:49:02 -04:00
parent 7c0186bc97
commit c9c0219393
3 changed files with 41 additions and 2 deletions

13
src/dehacked.c
View file

@ -6041,11 +6041,24 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_ORBITEM6", "S_ORBITEM6",
"S_ORBITEM7", "S_ORBITEM7",
"S_ORBITEM8", "S_ORBITEM8",
"S_ORBITEM1_CENTER",
"S_ORBITEM2_CENTER",
"S_ORBITEM3_CENTER",
"S_ORBITEM4_CENTER",
"S_ORBITEM5_CENTER",
"S_ORBITEM6_CENTER",
"S_ORBITEM7_CENTER",
"S_ORBITEM8_CENTER",
"S_ORBIDYA1", "S_ORBIDYA1",
"S_ORBIDYA2", "S_ORBIDYA2",
"S_ORBIDYA3", "S_ORBIDYA3",
"S_ORBIDYA4", "S_ORBIDYA4",
"S_ORBIDYA5", "S_ORBIDYA5",
"S_ORBIDYA1_CENTER",
"S_ORBIDYA2_CENTER",
"S_ORBIDYA3_CENTER",
"S_ORBIDYA4_CENTER",
"S_ORBIDYA5_CENTER",
// "Flicky" helper // "Flicky" helper
"S_NIGHTOPIANHELPER1", "S_NIGHTOPIANHELPER1",

17
src/info.c
View file

@ -3338,11 +3338,24 @@ state_t states[NUMSTATES] =
{SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM6}, // S_ORBITEM6 {SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM6}, // S_ORBITEM6
{SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM7}, // S_ORBITEM7 {SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM7}, // S_ORBITEM7
{SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM8 {SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM8
{SPR_CEMG, FF_FULLBRIGHT, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM1_CENTER}, // S_ORBITEM1_CENTER
{SPR_CEMG, FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM2_CENTER}, // S_ORBITEM2_CENTER
{SPR_CEMG, FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM3_CENTER}, // S_ORBITEM3_CENTER
{SPR_CEMG, FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM4_CENTER}, // S_ORBITEM4_CENTER
{SPR_CEMG, FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM5_CENTER}, // S_ORBITEM5_CENTER
{SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM6_CENTER}, // S_ORBITEM6_CENTER
{SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM7_CENTER}, // S_ORBITEM7_CENTER
{SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM8_CENTER}, // S_ORBITEM8_CENTER
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA1}, // S_ORBIDYA1 {SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA1}, // S_ORBIDYA1
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA2}, // S_ORBIDYA2 {SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA2}, // S_ORBIDYA2
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA3}, // S_ORBIDYA3 {SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA3}, // S_ORBIDYA3
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA4}, // S_ORBIDYA4 {SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA4}, // S_ORBIDYA4
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA5}, // S_ORBIDYA5 {SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA5}, // S_ORBIDYA5
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA1_CENTER}, // S_ORBIDYA1_CENTER
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA2_CENTER}, // S_ORBIDYA2_CENTER
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA3_CENTER}, // S_ORBIDYA3_CENTER
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA4_CENTER}, // S_ORBIDYA4_CENTER
{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA5_CENTER}, // S_ORBIDYA5_CENTER
// Flicky helper for NiGHTS // Flicky helper for NiGHTS
{SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1 {SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1
@ -14618,7 +14631,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_ORBITEM1, // meleestate S_ORBITEM1, // meleestate
S_ORBIDYA1, // missilestate S_ORBIDYA1, // missilestate
S_XPLD1, // deathstate S_XPLD1, // deathstate
S_NULL, // xdeathstate S_ORBITEM1_CENTER, // xdeathstate
sfx_s3k8a, // deathsound sfx_s3k8a, // deathsound
8, // speed 8, // speed
8*FRACUNIT, // radius 8*FRACUNIT, // radius
@ -14628,7 +14641,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_SCENERY, // flags MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate S_ORBIDYA1_CENTER // raisestate
}, },
{ // MT_LOCKON { // MT_LOCKON

13
src/info.h
View file

@ -3394,11 +3394,24 @@ typedef enum state
S_ORBITEM6, S_ORBITEM6,
S_ORBITEM7, S_ORBITEM7,
S_ORBITEM8, S_ORBITEM8,
S_ORBITEM1_CENTER,
S_ORBITEM2_CENTER,
S_ORBITEM3_CENTER,
S_ORBITEM4_CENTER,
S_ORBITEM5_CENTER,
S_ORBITEM6_CENTER,
S_ORBITEM7_CENTER,
S_ORBITEM8_CENTER,
S_ORBIDYA1, S_ORBIDYA1,
S_ORBIDYA2, S_ORBIDYA2,
S_ORBIDYA3, S_ORBIDYA3,
S_ORBIDYA4, S_ORBIDYA4,
S_ORBIDYA5, S_ORBIDYA5,
S_ORBIDYA1_CENTER,
S_ORBIDYA2_CENTER,
S_ORBIDYA3_CENTER,
S_ORBIDYA4_CENTER,
S_ORBIDYA5_CENTER,
// "Flicky" helper // "Flicky" helper
S_NIGHTOPIANHELPER1, S_NIGHTOPIANHELPER1,