From: Thomas Debesse Date: Sat, 28 Apr 2018 13:31:49 +0000 (+0200) Subject: q3map2: -fs_nobasepath implies -fs_nomagicpath X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5391410e5eb6b6b8794d06d6c0030473c4c246b3;p=xonotic%2Fnetradiant.git q3map2: -fs_nobasepath implies -fs_nomagicpath --- diff --git a/tools/quake3/q3map2/help.c b/tools/quake3/q3map2/help.c index a4d89047..da52c6c9 100644 --- a/tools/quake3/q3map2/help.c +++ b/tools/quake3/q3map2/help.c @@ -353,7 +353,7 @@ void HelpCommon() {"-fs_game ", "Sets a different game directory name (default for Q3A: baseq3, can be used more than once)"}, {"-fs_homebase ", "Specifies where the user home directory name is on Linux (default for Q3A: .q3a)"}, {"-fs_homepath ", "Sets the given path as home directory name"}, - {"-fs_nobasepath", "Do not load base paths in VFS"}, + {"-fs_nobasepath", "Do not load base paths in VFS, imply -fs_nomagicpath"}, {"-fs_nomagicpath", "Do not try to guess base path magically"}, {"-fs_nohomepath", "Do not load home path in VFS"}, {"-fs_pakpath ", "Specify a package directory (can be used more than once to look in multiple paths)"}, diff --git a/tools/quake3/q3map2/path_init.c b/tools/quake3/q3map2/path_init.c index a13821e9..0cd161a1 100644 --- a/tools/quake3/q3map2/path_init.c +++ b/tools/quake3/q3map2/path_init.c @@ -460,6 +460,8 @@ void InitPaths( int *argc, char **argv ){ /* -fs_nobasepath */ else if ( strcmp( argv[ i ], "-fs_nobasepath" ) == 0 ) { noBasePath = 1; + // we don't want any basepath, neither guessed ones + noMagicPath = 1; argv[ i ] = NULL; }