Title card fixes.
This commit is contained in:
parent
5b4d587b1a
commit
9319014d8d
19
src/g_game.c
19
src/g_game.c
|
@ -1895,7 +1895,7 @@ void G_StartTitleCard(void)
|
||||||
|
|
||||||
// The title card has been disabled for this map.
|
// The title card has been disabled for this map.
|
||||||
// Oh well.
|
// Oh well.
|
||||||
if ((mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD) || (gametyperules & GTR_NOTITLECARD))
|
if (!G_IsTitleCardAvailable())
|
||||||
{
|
{
|
||||||
WipeStageTitle = false;
|
WipeStageTitle = false;
|
||||||
return;
|
return;
|
||||||
|
@ -1938,6 +1938,23 @@ void G_PreLevelTitleCard(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// Returns true if the current level has a title card.
|
||||||
|
//
|
||||||
|
boolean G_IsTitleCardAvailable(void)
|
||||||
|
{
|
||||||
|
// The current level header explicitly disabled the title card.
|
||||||
|
if (mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// The current gametype doesn't have a title card.
|
||||||
|
if (gametyperules & GTR_NOTITLECARD)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// The title card is available.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
INT32 pausedelay = 0;
|
INT32 pausedelay = 0;
|
||||||
boolean pausebreakkey = false;
|
boolean pausebreakkey = false;
|
||||||
static INT32 camtoggledelay, camtoggledelay2 = 0;
|
static INT32 camtoggledelay, camtoggledelay2 = 0;
|
||||||
|
|
|
@ -143,6 +143,7 @@ void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar,
|
||||||
void G_DoLoadLevel(boolean resetplayer);
|
void G_DoLoadLevel(boolean resetplayer);
|
||||||
void G_StartTitleCard(void);
|
void G_StartTitleCard(void);
|
||||||
void G_PreLevelTitleCard(void);
|
void G_PreLevelTitleCard(void);
|
||||||
|
boolean G_IsTitleCardAvailable(void);
|
||||||
void G_DeferedPlayDemo(const char *demo);
|
void G_DeferedPlayDemo(const char *demo);
|
||||||
|
|
||||||
// Can be called by the startup code or M_Responder, calls P_SetupLevel.
|
// Can be called by the startup code or M_Responder, calls P_SetupLevel.
|
||||||
|
|
|
@ -1216,6 +1216,9 @@ void ST_startTitleCard(void)
|
||||||
//
|
//
|
||||||
void ST_preDrawTitleCard(void)
|
void ST_preDrawTitleCard(void)
|
||||||
{
|
{
|
||||||
|
if (!G_IsTitleCardAvailable())
|
||||||
|
return;
|
||||||
|
|
||||||
if (lt_ticker >= (lt_endtime + TICRATE))
|
if (lt_ticker >= (lt_endtime + TICRATE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1231,6 +1234,9 @@ void ST_preDrawTitleCard(void)
|
||||||
//
|
//
|
||||||
void ST_runTitleCard(void)
|
void ST_runTitleCard(void)
|
||||||
{
|
{
|
||||||
|
if (!G_IsTitleCardAvailable())
|
||||||
|
return;
|
||||||
|
|
||||||
if (lt_ticker >= (lt_endtime + TICRATE))
|
if (lt_ticker >= (lt_endtime + TICRATE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1284,6 +1290,9 @@ void ST_drawTitleCard(void)
|
||||||
INT32 zzticker;
|
INT32 zzticker;
|
||||||
patch_t *actpat, *zigzag, *zztext;
|
patch_t *actpat, *zigzag, *zztext;
|
||||||
|
|
||||||
|
if (!G_IsTitleCardAvailable())
|
||||||
|
return;
|
||||||
|
|
||||||
#ifdef HAVE_BLUA
|
#ifdef HAVE_BLUA
|
||||||
if (!LUA_HudEnabled(hud_stagetitle))
|
if (!LUA_HudEnabled(hud_stagetitle))
|
||||||
goto luahook;
|
goto luahook;
|
||||||
|
|
Loading…
Reference in New Issue