Add SF_NOSUPERSPRITES
This commit is contained in:
parent
2322644488
commit
edfd64877c
|
@ -49,6 +49,7 @@ typedef enum
|
||||||
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)
|
SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
|
||||||
|
SF_NOSUPERSPRITES = 1<<16, // Don't use super sprites while super
|
||||||
// free up to and including 1<<31
|
// free up to and including 1<<31
|
||||||
} skinflags_t;
|
} skinflags_t;
|
||||||
|
|
||||||
|
|
|
@ -9619,6 +9619,7 @@ struct {
|
||||||
{"SF_MULTIABILITY",SF_MULTIABILITY},
|
{"SF_MULTIABILITY",SF_MULTIABILITY},
|
||||||
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
|
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
|
||||||
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
|
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
|
||||||
|
{"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
|
||||||
|
|
||||||
// Dashmode constants
|
// Dashmode constants
|
||||||
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
|
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
|
||||||
|
|
|
@ -394,7 +394,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
|
||||||
|
|
||||||
if (skin)
|
if (skin)
|
||||||
{
|
{
|
||||||
spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super]) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player);
|
spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super] && !(player->charflags & SF_NOSUPERSPRITES)) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player);
|
||||||
numframes = skin->sprites[spr2].numframes;
|
numframes = skin->sprites[spr2].numframes;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -821,7 +821,7 @@ static void ST_drawLivesArea(void)
|
||||||
// skincolor face/super
|
// skincolor face/super
|
||||||
UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->mo->color, GTC_CACHE);
|
UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->mo->color, GTC_CACHE);
|
||||||
patch_t *face = faceprefix[stplyr->skin];
|
patch_t *face = faceprefix[stplyr->skin];
|
||||||
if (stplyr->powers[pw_super])
|
if (stplyr->powers[pw_super] && !(stplyr->charflags & SF_NOSUPERSPRITES))
|
||||||
face = superprefix[stplyr->skin];
|
face = superprefix[stplyr->skin];
|
||||||
V_DrawSmallMappedPatch(hudinfo[HUD_LIVES].x, hudinfo[HUD_LIVES].y,
|
V_DrawSmallMappedPatch(hudinfo[HUD_LIVES].x, hudinfo[HUD_LIVES].y,
|
||||||
hudinfo[HUD_LIVES].f|V_PERPLAYER|V_HUDTRANS, face, colormap);
|
hudinfo[HUD_LIVES].f|V_PERPLAYER|V_HUDTRANS, face, colormap);
|
||||||
|
|
Loading…
Reference in New Issue