More fixes for titlecard option stuff
This commit is contained in:
parent
fed8167a81
commit
19cdb002ab
|
@ -351,18 +351,18 @@ typedef struct
|
||||||
} mapheader_t;
|
} mapheader_t;
|
||||||
|
|
||||||
// level flags
|
// level flags
|
||||||
#define LF_SCRIPTISFILE 1<<0 ///< True if the script is a file, not a lump.
|
#define LF_SCRIPTISFILE (1<<0) ///< True if the script is a file, not a lump.
|
||||||
#define LF_SPEEDMUSIC 1<<1 ///< Speed up act music for super sneakers
|
#define LF_SPEEDMUSIC (1<<1) ///< Speed up act music for super sneakers
|
||||||
#define LF_NOSSMUSIC 1<<2 ///< Disable Super Sonic music
|
#define LF_NOSSMUSIC (1<<2) ///< Disable Super Sonic music
|
||||||
#define LF_NORELOAD 1<<3 ///< Don't reload level on death
|
#define LF_NORELOAD (1<<3) ///< Don't reload level on death
|
||||||
#define LF_NOZONE 1<<4 ///< Don't include "ZONE" on level title
|
#define LF_NOZONE (1<<4) ///< Don't include "ZONE" on level title
|
||||||
#define LF_SAVEGAME 1<<5 ///< Save the game upon loading this level
|
#define LF_SAVEGAME (1<<5) ///< Save the game upon loading this level
|
||||||
#define LF_MIXNIGHTSCOUNTDOWN 1<<6 ///< Play sfx_timeup instead of music change for NiGHTS countdown
|
#define LF_MIXNIGHTSCOUNTDOWN (1<<6) ///< Play sfx_timeup instead of music change for NiGHTS countdown
|
||||||
#define LF_WARNINGTITLE 1<<7 ///< WARNING! WARNING! WARNING! WARNING!
|
#define LF_WARNINGTITLE (1<<7) ///< WARNING! WARNING! WARNING! WARNING!
|
||||||
|
|
||||||
#define LF_NOTITLECARDFIRST 1<<8
|
#define LF_NOTITLECARDFIRST (1<<8)
|
||||||
#define LF_NOTITLECARDRESPAWN 1<<9
|
#define LF_NOTITLECARDRESPAWN (1<<9)
|
||||||
#define LF_NOTITLECARDRECORDATTACK 1<<10
|
#define LF_NOTITLECARDRECORDATTACK (1<<10)
|
||||||
#define LF_NOTITLECARD (LF_NOTITLECARDFIRST|LF_NOTITLECARDRESPAWN|LF_NOTITLECARDRECORDATTACK) ///< Don't start the title card at all
|
#define LF_NOTITLECARD (LF_NOTITLECARDFIRST|LF_NOTITLECARDRESPAWN|LF_NOTITLECARDRECORDATTACK) ///< Don't start the title card at all
|
||||||
|
|
||||||
#define LF2_HIDEINMENU 1 ///< Hide in the multiplayer menu
|
#define LF2_HIDEINMENU 1 ///< Hide in the multiplayer menu
|
||||||
|
|
|
@ -1938,7 +1938,7 @@ boolean G_IsTitleCardAvailable(void)
|
||||||
// The current level header explicitly disabled the title card.
|
// The current level header explicitly disabled the title card.
|
||||||
UINT16 titleflag = LF_NOTITLECARDFIRST;
|
UINT16 titleflag = LF_NOTITLECARDFIRST;
|
||||||
|
|
||||||
if (modeattacking)
|
if (modeattacking != ATTACKING_NONE)
|
||||||
titleflag = LF_NOTITLECARDRECORDATTACK;
|
titleflag = LF_NOTITLECARDRECORDATTACK;
|
||||||
else if (titlecardforreload)
|
else if (titlecardforreload)
|
||||||
titleflag = LF_NOTITLECARDRESPAWN;
|
titleflag = LF_NOTITLECARDRESPAWN;
|
||||||
|
|
|
@ -2625,7 +2625,7 @@ static void ST_overlayDrawer(void)
|
||||||
// Check for a valid level title
|
// Check for a valid level title
|
||||||
// If the HUD is enabled
|
// If the HUD is enabled
|
||||||
// And, if Lua is running, if the HUD library has the stage title enabled
|
// And, if Lua is running, if the HUD library has the stage title enabled
|
||||||
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD) && *mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer)))
|
if (G_IsTitleCardAvailable() && *mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer)))
|
||||||
{
|
{
|
||||||
stagetitle = true;
|
stagetitle = true;
|
||||||
ST_preDrawTitleCard();
|
ST_preDrawTitleCard();
|
||||||
|
|
Loading…
Reference in New Issue