stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 19:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

More fixes for titlecard option stuff

Browse source
This commit is contained in:
fickleheart 2020-02-09 17:53:13 -06:00
parent fed8167a81
commit 19cdb002ab
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/doomstat.h
View file

@ -351,18 +351,18 @@ typedef struct
} mapheader_t;
// level flags
#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_NOSSMUSIC 1<<2 ///< Disable Super Sonic music
#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_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_WARNINGTITLE 1<<7 ///< WARNING! WARNING! WARNING! WARNING!
#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_NOSSMUSIC (1<<2) ///< Disable Super Sonic music
#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_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_WARNINGTITLE (1<<7) ///< WARNING! WARNING! WARNING! WARNING!
#define LF_NOTITLECARDFIRST 1<<8
#define LF_NOTITLECARDRESPAWN 1<<9
#define LF_NOTITLECARDRECORDATTACK 1<<10
#define LF_NOTITLECARDFIRST (1<<8)
#define LF_NOTITLECARDRESPAWN (1<<9)
#define LF_NOTITLECARDRECORDATTACK (1<<10)
#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

2
src/g_game.c
View file

@ -1938,7 +1938,7 @@ boolean G_IsTitleCardAvailable(void)
// The current level header explicitly disabled the title card.
UINT16 titleflag = LF_NOTITLECARDFIRST;
if (modeattacking)
if (modeattacking != ATTACKING_NONE)
titleflag = LF_NOTITLECARDRECORDATTACK;
else if (titlecardforreload)
titleflag = LF_NOTITLECARDRESPAWN;

2
src/st_stuff.c
View file

@ -2625,7 +2625,7 @@ static void ST_overlayDrawer(void)
// Check for a valid level title
// If the HUD is 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;
ST_preDrawTitleCard();