From 865fc23ebfb4590e090e8156e830657008ca4f44 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 15 May 2011 22:26:46 +0200 Subject: [PATCH] fix compile errors --- tools/quake3/q3map2/path_init.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/quake3/q3map2/path_init.c b/tools/quake3/q3map2/path_init.c index 3a12b49b..4994c5f5 100644 --- a/tools/quake3/q3map2/path_init.c +++ b/tools/quake3/q3map2/path_init.c @@ -62,9 +62,8 @@ PathLokiGetHomeDir() gets the user's home dir (for ~/.q3a) */ -char *LokiGetHomeDir( qboolean *usedot ) +char *LokiGetHomeDir(void) { - *usedot = qtrue; #ifndef Q_UNIX return NULL; #else @@ -108,10 +107,10 @@ initializes some paths on linux/os x void LokiInitPaths( char *argv0 ) { + char *home; + if(!homePath) { - char *home; - /* get home dir */ home = LokiGetHomeDir(); if( home == NULL ) @@ -120,6 +119,8 @@ void LokiInitPaths( char *argv0 ) /* set home path */ homePath = home; } + else + home = homePath; #ifndef Q_UNIX /* this is kinda crap, but hey */ @@ -282,7 +283,7 @@ void AddHomeBasePath( char *path ) { int i; char temp[ MAX_OS_PATH ]; - int l, homePathLen; + int homePathLen; if(!homePath) return; @@ -293,7 +294,7 @@ void AddHomeBasePath( char *path ) /* strip leading dot, if homePath does not end in /. */ homePathLen = strlen(homePath); - if(!strcmp(path, ".") + if(!strcmp(path, ".")) { /* -fs_homebase . means that -fs_home is to be used as is */ strcpy(temp, homePath); -- 2.39.2