summaryrefslogtreecommitdiff
path: root/src/qcommon
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2016-04-07 11:58:19 +0100
committerTim Angus <tim@ngus.net>2016-04-07 11:58:19 +0100
commit87abdd914988724e164ffb16380ad26be8420b84 (patch)
tree5395a525fe8803afd0196e1f9115d74c522db4fb /src/qcommon
parent5658bc638f194fd6be9593860b6faf16baea8190 (diff)
Make it compile
Diffstat (limited to 'src/qcommon')
-rw-r--r--src/qcommon/files.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/qcommon/files.c b/src/qcommon/files.c
index 02235bcf..8e1cd0d3 100644
--- a/src/qcommon/files.c
+++ b/src/qcommon/files.c
@@ -2448,8 +2448,6 @@ int FS_GetModList( char *listbuf, int bufsize ) {
int dummy;
char **pFiles0 = NULL;
char **pFiles1 = NULL;
- char **pFiles2 = NULL;
- char **pFiles3 = NULL;
qboolean bDrop = qfalse;
*listbuf = 0;
@@ -2457,11 +2455,7 @@ int FS_GetModList( char *listbuf, int bufsize ) {
pFiles0 = Sys_ListFiles( fs_homepath->string, NULL, NULL, &dummy, qtrue );
pFiles1 = Sys_ListFiles( fs_basepath->string, NULL, NULL, &dummy, qtrue );
- pFiles2 = Sys_ListFiles( fs_steampath->string, NULL, NULL, &dummy, qtrue );
- // we searched for mods in the three paths
- // it is likely that we have duplicate names now, which we will cleanup below
- pFiles3 = Sys_ConcatenateFileLists( pFiles0, pFiles1 );
- pFiles = Sys_ConcatenateFileLists( pFiles2, pFiles3 );
+ pFiles = Sys_ConcatenateFileLists( pFiles0, pFiles1 );
nPotential = Sys_CountFileList(pFiles);
@@ -2504,15 +2498,6 @@ int FS_GetModList( char *listbuf, int bufsize ) {
Sys_FreeFileList( pPaks );
}
- /* try on steam path */
- if ( nPaks <= 0 )
- {
- path = FS_BuildOSPath( fs_steampath->string, name, "" );
- nPaks = 0;
- pPaks = Sys_ListFiles( path, ".pk3", NULL, &nPaks, qfalse );
- Sys_FreeFileList( pPaks );
- }
-
if (nPaks > 0) {
nLen = strlen(name) + 1;
// nLen is the length of the mod path
@@ -3241,9 +3226,6 @@ static void FS_Startup( const char *gameName )
// check for additional base game so mods can be based upon other mods
if ( fs_basegame->string[0] && Q_stricmp( fs_basegame->string, gameName ) ) {
- if (fs_steampath->string[0]) {
- FS_AddGameDirectory(fs_steampath->string, fs_basegame->string);
- }
if (fs_basepath->string[0]) {
FS_AddGameDirectory(fs_basepath->string, fs_basegame->string);
}
@@ -3254,9 +3236,6 @@ static void FS_Startup( const char *gameName )
// check for additional game folder for mods
if ( fs_gamedirvar->string[0] && Q_stricmp( fs_gamedirvar->string, gameName ) ) {
- if (fs_steampath->string[0]) {
- FS_AddGameDirectory(fs_steampath->string, fs_gamedirvar->string);
- }
if (fs_basepath->string[0]) {
FS_AddGameDirectory(fs_basepath->string, fs_gamedirvar->string);
}