Merge branch 'nomagicpath' into 'master'

[xonotic/netradiant.git] / tools / quake3 / q3map2 / path_init.c

diff --git a/tools/quake3/q3map2/path_init.c b/tools/quake3/q3map2/path_init.c
index a13821e945130efd7f9c71b1011cb3adbdfd702d..80cdbcae5d4e1fb50d571b72532c6c4919000df7 100644 (file)
--- a/tools/quake3/q3map2/path_init.c
+++ b/tools/quake3/q3map2/path_init.c
@@ -101,7 +101,7 @@ char *LokiGetHomeDir( void ){
  */
 
 void LokiInitPaths( char *argv0 ){
-       char        *home;
+       char *home;
 
        if ( !homePath ) {
                /* get home dir */
@@ -121,9 +121,10 @@ void LokiInitPaths( char *argv0 ){
        /* this is kinda crap, but hey */
        strcpy( installPath, "../" );
        #else
+
        char temp[ MAX_OS_PATH ];
-       char        *path;
-       char        *last;
+       char *path;
+       char *last;
        qboolean found;
 
 
@@ -175,7 +176,6 @@ void LokiInitPaths( char *argv0 ){
                                path++;
                        }
 
-
                        /* concatenate */
                        if ( last > ( path + 1 ) ) {
                                // +1 hack: Q_strncat calls Q_strncpyz that expects a len including '\0'
@@ -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;
                }