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

Change gas jet actions & clean up some flags and names.

Browse source
This commit is contained in:
sphere 2020-04-09 13:25:10 +02:00
parent 14c305f55a
commit 3475c4011f
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/info.c
View file

@ -370,7 +370,7 @@ char sprnames[NUMSPRITES + 1][5] =
// Springs
"FANS", // Fan
"STEM", // Steam riser
"STEM", // Steam jet
"BUMP", // Bumpers
"BLON", // Balloons
"SPRY", // Yellow spring
@ -3106,7 +3106,7 @@ state_t states[NUMSTATES] =
{SPR_FANS, 3, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN5}, // S_FAN4
{SPR_FANS, 4, 1, {A_FanBubbleSpawn}, 512, 0, S_FAN}, // S_FAN5
// Steam Riser
// Steam jet
{SPR_STEM, 0, 2, {A_SetSolidSteam}, 0, 0, S_STEAM2}, // S_STEAM1
{SPR_STEM, 1, 2, {NULL}, 0, 0, S_STEAM3}, // S_STEAM2
{SPR_STEM, 2, 2, {NULL}, 0, 0, S_STEAM4}, // S_STEAM3
@ -7408,7 +7408,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
20*FRACUNIT, // mass
0, // damage
sfx_None, // activesound
MF_SOLID|MF_SPRING, // flags
MF_SPRING, // flags
S_NULL // raisestate
},

4
src/info.h
View file

@ -633,7 +633,7 @@ typedef enum sprite
// Springs
SPR_FANS, // Fan
SPR_STEM, // Steam riser
SPR_STEM, // Steam jet
SPR_BUMP, // Bumpers
SPR_BLON, // Balloons
SPR_SPRY, // Yellow spring
@ -3247,7 +3247,7 @@ typedef enum state
S_FAN4,
S_FAN5,
// Steam Riser
// Steam jet
S_STEAM1,
S_STEAM2,
S_STEAM3,

11
src/p_enemy.c
View file

@ -4921,7 +4921,7 @@ void A_ThrownRing(mobj_t *actor)
// Function: A_SetSolidSteam
//
// Description: Makes steam solid so it collides with the player to boost them.
// Description: Applies the spring flag to steam jets, and randomly plays one of two sounds.
//
// var1 = unused
// var2 = unused
@ -4931,8 +4931,8 @@ void A_SetSolidSteam(mobj_t *actor)
if (LUA_CallAction("A_SetSolidSteam", actor))
return;
actor->flags &= ~MF_NOCLIP;
actor->flags |= MF_SOLID;
actor->flags |= MF_SPRING;
if (!(actor->flags2 & MF2_AMBUSH))
{
if (P_RandomChance(FRACUNIT/8))
@ -4952,7 +4952,7 @@ void A_SetSolidSteam(mobj_t *actor)
// Function: A_UnsetSolidSteam
//
// Description: Makes an object non-solid and also noclip. Used by the steam.
// Description: Removes the spring flag from an object. Used by steam jets.
//
// var1 = unused
// var2 = unused
@ -4962,8 +4962,7 @@ void A_UnsetSolidSteam(mobj_t *actor)
if (LUA_CallAction("A_UnsetSolidSteam", actor))
return;
actor->flags &= ~MF_SOLID;
actor->flags |= MF_NOCLIP;
actor->flags &= ~MF_SPRING;
}
// Function: A_SignSpin