Config aus dem Home einlesen

This commit is contained in:
Yamagi Burmeister 2009-10-03 16:37:41 +00:00
parent 137c9ce5d7
commit a417bed9fc

View file

@ -1414,13 +1414,8 @@ FS_SetGamedir(char *dir)
Cvar_FullSet("gamedir", dir, CVAR_SERVERINFO | CVAR_NOSET); Cvar_FullSet("gamedir", dir, CVAR_SERVERINFO | CVAR_NOSET);
if (fs_cddir->string[0] == '\0') if (fs_cddir->string[0] == '\0')
FS_AddGameDirectory(va("%s/%s", fs_cddir->string, dir)); FS_AddGameDirectory(va("%s/%s", fs_cddir->string, dir));
#ifdef LIBDIR
FS_AddGameDirectory(va("%s/%s", LIBDIR, dir));
#endif
FS_AddGameDirectory(va("%s/%s", fs_basedir->string, dir)); FS_AddGameDirectory(va("%s/%s", fs_basedir->string, dir));
#ifdef DATADIR
FS_AddHomeAsGameDirectory(dir); FS_AddHomeAsGameDirectory(dir);
#endif
} }
} }
@ -1744,11 +1739,7 @@ FS_InitFilesystem(void)
/* /*
* basedir <path> Allows the game to run from outside the data tree. * basedir <path> Allows the game to run from outside the data tree.
*/ */
#ifdef DATADIR
fs_basedir = Cvar_Get("basedir", DATADIR, CVAR_NOSET);
#else
fs_basedir = Cvar_Get("basedir", ".", CVAR_NOSET); fs_basedir = Cvar_Get("basedir", ".", CVAR_NOSET);
#endif
/* /*
* cddir <path> Logically concatenates the cddir after the basedir to * cddir <path> Logically concatenates the cddir after the basedir to
@ -1768,13 +1759,8 @@ FS_InitFilesystem(void)
fs_homepath = Cvar_Get("homepath", Sys_GetCurrentDirectory(), CVAR_NOSET); fs_homepath = Cvar_Get("homepath", Sys_GetCurrentDirectory(), CVAR_NOSET);
/* Add baseq2 to search path. */ /* Add baseq2 to search path. */
#ifdef LIBDIR
FS_AddGameDirectory(va("%s/" BASEDIRNAME, LIBDIR));
#endif
FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string)); FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string));
#ifdef DATADIR
FS_AddHomeAsGameDirectory(BASEDIRNAME); FS_AddHomeAsGameDirectory(BASEDIRNAME);
#endif
/* Any set gamedirs will be freed up to here. */ /* Any set gamedirs will be freed up to here. */
fs_baseSearchPaths = fs_searchPaths; fs_baseSearchPaths = fs_searchPaths;