summaryrefslogtreecommitdiff
path: root/src/qcommon
diff options
context:
space:
mode:
Diffstat (limited to 'src/qcommon')
-rw-r--r--src/qcommon/common.c9
-rw-r--r--src/qcommon/files.c7
2 files changed, 1 insertions, 15 deletions
diff --git a/src/qcommon/common.c b/src/qcommon/common.c
index 0d82ac81..6ba479e3 100644
--- a/src/qcommon/common.c
+++ b/src/qcommon/common.c
@@ -71,7 +71,6 @@ cvar_t *com_showtrace;
cvar_t *com_version;
cvar_t *com_blood;
cvar_t *com_buildScript; // for automated data building scripts
-cvar_t *com_introPlayed;
cvar_t *cl_paused;
cvar_t *sv_paused;
cvar_t *com_cameraMode;
@@ -2413,8 +2412,6 @@ void Com_Init( char *commandLine ) {
com_cl_running = Cvar_Get ("cl_running", "0", CVAR_ROM);
com_buildScript = Cvar_Get( "com_buildScript", "0", 0 );
- com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE);
-
#if defined(_WIN32) && defined(_DEBUG)
com_noErrorInterrupt = Cvar_Get( "com_noErrorInterrupt", "0", 0 );
#endif
@@ -2457,11 +2454,7 @@ void Com_Init( char *commandLine ) {
if ( !Com_AddStartupCommands() ) {
// if the user didn't give any commands, run default action
if ( !com_dedicated->integer ) {
- Cbuf_AddText ("cinematic idlogo.RoQ\n");
- if( !com_introPlayed->integer ) {
- Cvar_Set( com_introPlayed->name, "1" );
- Cvar_Set( "nextmap", "cinematic intro.RoQ" );
- }
+ Cbuf_AddText ("cinematic splash.RoQ\n");
}
}
diff --git a/src/qcommon/files.c b/src/qcommon/files.c
index 1a336de5..09926a1a 100644
--- a/src/qcommon/files.c
+++ b/src/qcommon/files.c
@@ -1057,13 +1057,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
return -1;
}
- // make sure the q3key file is only readable by the quake3.exe at initialization
- // any other time the key should only be accessed in memory using the provided functions
- if( com_fullyInitialized && strstr( filename, "q3key" ) ) {
- *file = 0;
- return -1;
- }
-
//
// search through the path, one element at a time
//