ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-01-06 00:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into game/eliteforce

Browse source 
Conflicts:
	code/qcommon/common.c
This commit is contained in:
Zack Middleton 2016-06-17 03:01:55 -05:00
commit c67502a07e
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/qcommon/common.c
View file

@ -81,7 +81,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;
@ -2841,7 +2843,10 @@ void Com_Init( char *commandLine ) {
com_busyWait = Cvar_Get("com_busyWait", "0", CVAR_ARCHIVE); com_busyWait = Cvar_Get("com_busyWait", "0", CVAR_ARCHIVE);
Cvar_Get("com_errorMessage", "", CVAR_ROM | CVAR_NORESTART); Cvar_Get("com_errorMessage", "", CVAR_ROM | CVAR_NORESTART);
#ifdef CINEMATICS_INTRO
com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE); com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE);
#endif
Cvar_Get( "com_novmcompat", "1", CVAR_ROM); // set to 1 to indicate VMs are run by the new engine. Cvar_Get( "com_novmcompat", "1", CVAR_ROM); // set to 1 to indicate VMs are run by the new engine.
s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ ); s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
@ -2891,18 +2896,18 @@ void Com_Init( char *commandLine ) {
// add + commands from command line // add + commands from command line
if ( !Com_AddStartupCommands() ) { if ( !Com_AddStartupCommands() ) {
#ifdef ELITEFORCE
Cvar_Set( com_introPlayed->name, "1" );
#else
// 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 #endif
}
} }
// start in full screen ui mode // start in full screen ui mode

2
code/ui/ui_main.c
View file

@ -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];