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

Merge branch 'nonightsever' into 'next'

Browse source 
Make NiGHTS super consistent with regular super (Closes #520 for real this time)

Closes #520

See merge request STJr/SRB2!1666
This commit is contained in:
sphere 2024-02-25 13:55:44 +00:00
commit 1cc9e17efa
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/info.c
View file

@ -648,13 +648,13 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = {
0, // SPR2_TRNS, 0, // SPR2_TRNS,
FF_SPR2SUPER|SPR2_STND, // SPR2_NSTD, SPR2_STND, // SPR2_NSTD,
FF_SPR2SUPER|SPR2_FALL, // SPR2_NFLT, SPR2_FALL, // SPR2_NFLT,
0, // SPR2_NFLY, (will never be referenced unless skin 0 lacks this) 0, // SPR2_NFLY, (will never be referenced unless skin 0 lacks this)
SPR2_NFLY, // SPR2_NDRL, SPR2_NFLY, // SPR2_NDRL,
FF_SPR2SUPER|SPR2_STUN, // SPR2_NSTN, SPR2_STUN, // SPR2_NSTN,
SPR2_NSTN, // SPR2_NPUL, SPR2_NSTN, // SPR2_NPUL,
FF_SPR2SUPER|SPR2_ROLL, // SPR2_NATK, SPR2_ROLL, // SPR2_NATK,
0, // SPR2_TAL0, (this will look mighty stupid but oh well) 0, // SPR2_TAL0, (this will look mighty stupid but oh well)
SPR2_TAL0, // SPR2_TAL1, SPR2_TAL0, // SPR2_TAL1,

4
src/p_mobj.c
View file

@ -402,9 +402,9 @@ static boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
UINT16 stateframe = st->frame; UINT16 stateframe = st->frame;
// Add/Remove FF_SPR2SUPER based on certain conditions // Add/Remove FF_SPR2SUPER based on certain conditions
if (player->charflags & SF_NOSUPERSPRITES) if (player->charflags & SF_NOSUPERSPRITES || (player->powers[pw_carry] == CR_NIGHTSMODE && (player->charflags & SF_NONIGHTSSUPER)))
stateframe = stateframe & ~FF_SPR2SUPER; stateframe = stateframe & ~FF_SPR2SUPER;
else if (player->powers[pw_super]) else if (player->powers[pw_super] || (player->powers[pw_carry] == CR_NIGHTSMODE && (player->charflags & SF_SUPER)))
stateframe = stateframe | FF_SPR2SUPER; stateframe = stateframe | FF_SPR2SUPER;
if (stateframe & FF_SPR2SUPER) if (stateframe & FF_SPR2SUPER)

2
src/p_user.c
View file

@ -13199,7 +13199,7 @@ void P_ForceLocalAngle(player_t *player, angle_t angle)
boolean P_PlayerFullbright(player_t *player) boolean P_PlayerFullbright(player_t *player)
{ {
return (player->powers[pw_super] return (player->powers[pw_super]
|| ((player->powers[pw_carry] == CR_NIGHTSMODE && (((skin_t *)player->mo->skin)->flags & (SF_SUPER|SF_NONIGHTSSUPER)) == SF_SUPER) // Super colours? Super bright! || ((player->powers[pw_carry] == CR_NIGHTSMODE && (player->charflags & (SF_SUPER|SF_NONIGHTSSUPER)) == SF_SUPER) // Super colours? Super bright!
&& (player->exiting && (player->exiting
|| !(player->mo->state >= &states[S_PLAY_NIGHTS_TRANS1] || !(player->mo->state >= &states[S_PLAY_NIGHTS_TRANS1]
&& player->mo->state < &states[S_PLAY_NIGHTS_TRANS6])))); // Note the < instead of <= && player->mo->state < &states[S_PLAY_NIGHTS_TRANS6])))); // Note the < instead of <=