mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-12-13 05:31:29 +00:00
Only play logo/intro if their filenames have been defined in q_shared.h
This commit is contained in:
parent
9f6c4942ee
commit
bb7ad55382
2 changed files with 8 additions and 0 deletions
|
@ -72,7 +72,9 @@ cvar_t *com_showtrace;
|
||||||
cvar_t *com_version;
|
cvar_t *com_version;
|
||||||
cvar_t *com_blood;
|
cvar_t *com_blood;
|
||||||
cvar_t *com_buildScript; // for automated data building scripts
|
cvar_t *com_buildScript; // for automated data building scripts
|
||||||
|
#ifdef CINEMATICS_INTRO
|
||||||
cvar_t *com_introPlayed;
|
cvar_t *com_introPlayed;
|
||||||
|
#endif
|
||||||
cvar_t *cl_paused;
|
cvar_t *cl_paused;
|
||||||
cvar_t *sv_paused;
|
cvar_t *sv_paused;
|
||||||
cvar_t *cl_packetdelay;
|
cvar_t *cl_packetdelay;
|
||||||
|
@ -2805,11 +2807,15 @@ void Com_Init( char *commandLine ) {
|
||||||
if ( !Com_AddStartupCommands() ) {
|
if ( !Com_AddStartupCommands() ) {
|
||||||
// if the user didn't give any commands, run default action
|
// if the user didn't give any commands, run default action
|
||||||
if ( !com_dedicated->integer ) {
|
if ( !com_dedicated->integer ) {
|
||||||
|
#ifdef CINEMATICS_LOGO
|
||||||
Cbuf_AddText ("cinematic " CINEMATICS_LOGO "\n");
|
Cbuf_AddText ("cinematic " CINEMATICS_LOGO "\n");
|
||||||
|
#endif
|
||||||
|
#ifdef CINEMATICS_INTRO
|
||||||
if( !com_introPlayed->integer ) {
|
if( !com_introPlayed->integer ) {
|
||||||
Cvar_Set( com_introPlayed->name, "1" );
|
Cvar_Set( com_introPlayed->name, "1" );
|
||||||
Cvar_Set( "nextmap", "cinematic " CINEMATICS_INTRO );
|
Cvar_Set( "nextmap", "cinematic " CINEMATICS_INTRO );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3222,7 +3222,9 @@ static void UI_RunMenuScript(char **args) {
|
||||||
trap_Cmd_ExecuteText( EXEC_APPEND, "exec default.cfg\n");
|
trap_Cmd_ExecuteText( EXEC_APPEND, "exec default.cfg\n");
|
||||||
trap_Cmd_ExecuteText( EXEC_APPEND, "cvar_restart\n");
|
trap_Cmd_ExecuteText( EXEC_APPEND, "cvar_restart\n");
|
||||||
Controls_SetDefaults();
|
Controls_SetDefaults();
|
||||||
|
#ifdef CINEMATICS_INTRO
|
||||||
trap_Cvar_Set("com_introPlayed", "1" );
|
trap_Cvar_Set("com_introPlayed", "1" );
|
||||||
|
#endif
|
||||||
trap_Cmd_ExecuteText( EXEC_APPEND, "vid_restart\n" );
|
trap_Cmd_ExecuteText( EXEC_APPEND, "vid_restart\n" );
|
||||||
} else if (Q_stricmp(name, "getCDKey") == 0) {
|
} else if (Q_stricmp(name, "getCDKey") == 0) {
|
||||||
char out[17];
|
char out[17];
|
||||||
|
|
Loading…
Reference in a new issue