Merge branch 'SF_NONIGHTSSUPER' into 'next'
Skin flag for disabling super colors in NiGHTS See merge request STJr/SRB2!782
This commit is contained in:
commit
aad225932d
|
@ -48,6 +48,7 @@ typedef enum
|
||||||
SF_FASTEDGE = 1<<12, // Faster edge teeter?
|
SF_FASTEDGE = 1<<12, // Faster edge teeter?
|
||||||
SF_MULTIABILITY = 1<<13, // Revenge of Final Demo.
|
SF_MULTIABILITY = 1<<13, // Revenge of Final Demo.
|
||||||
SF_NONIGHTSROTATION = 1<<14, // Disable sprite rotation for NiGHTS
|
SF_NONIGHTSROTATION = 1<<14, // Disable sprite rotation for NiGHTS
|
||||||
|
SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
|
||||||
// free up to and including 1<<31
|
// free up to and including 1<<31
|
||||||
} skinflags_t;
|
} skinflags_t;
|
||||||
|
|
||||||
|
|
|
@ -9467,6 +9467,7 @@ struct {
|
||||||
{"SF_FASTEDGE",SF_FASTEDGE},
|
{"SF_FASTEDGE",SF_FASTEDGE},
|
||||||
{"SF_MULTIABILITY",SF_MULTIABILITY},
|
{"SF_MULTIABILITY",SF_MULTIABILITY},
|
||||||
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
|
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
|
||||||
|
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
|
||||||
|
|
||||||
// Dashmode constants
|
// Dashmode constants
|
||||||
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
|
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
|
||||||
|
|
|
@ -7982,7 +7982,7 @@ static void P_MovePlayer(player_t *player)
|
||||||
&& player->mo->state < &states[S_PLAY_NIGHTS_TRANS6]))) // Note the < instead of <=
|
&& player->mo->state < &states[S_PLAY_NIGHTS_TRANS6]))) // Note the < instead of <=
|
||||||
{
|
{
|
||||||
skin_t *skin = ((skin_t *)(player->mo->skin));
|
skin_t *skin = ((skin_t *)(player->mo->skin));
|
||||||
if (skin->flags & SF_SUPER)
|
if (( skin->flags & (SF_SUPER|SF_NONIGHTSSUPER) ) == SF_SUPER)
|
||||||
{
|
{
|
||||||
player->mo->color = skin->supercolor
|
player->mo->color = skin->supercolor
|
||||||
+ ((player->nightstime == player->startedtime)
|
+ ((player->nightstime == player->startedtime)
|
||||||
|
|
|
@ -504,6 +504,7 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
|
||||||
GETFLAG(FASTEDGE)
|
GETFLAG(FASTEDGE)
|
||||||
GETFLAG(MULTIABILITY)
|
GETFLAG(MULTIABILITY)
|
||||||
GETFLAG(NONIGHTSROTATION)
|
GETFLAG(NONIGHTSROTATION)
|
||||||
|
GETFLAG(NONIGHTSSUPER)
|
||||||
#undef GETFLAG
|
#undef GETFLAG
|
||||||
|
|
||||||
else // let's check if it's a sound, otherwise error out
|
else // let's check if it's a sound, otherwise error out
|
||||||
|
|
Loading…
Reference in New Issue