X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=ea5ed01a06a8898b9a60bd6a667fee291a9b8c1d;hb=8e17da8cdff134bfa0e766a50f408a3c06428f54;hp=9125a4e142740346420966d5957ed6711463a27c;hpb=e8b94b38c4be1bf3ada57ade9eb3a96adb080775;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 9125a4e1..ea5ed01a 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -450,38 +450,6 @@ char *getRealName() return real_name; } -char *getHomeDir() -{ - static char *dir = NULL; - -#if defined(PLATFORM_WIN32) - if (dir == NULL) - { - dir = checked_malloc(MAX_PATH + 1); - - if (!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, dir))) - strcpy(dir, "."); - } -#elif defined(PLATFORM_UNIX) - if (dir == NULL) - { - if ((dir = getenv("HOME")) == NULL) - { - struct passwd *pwd; - - if ((pwd = getpwuid(getuid())) != NULL) - dir = getStringCopy(pwd->pw_dir); - else - dir = "."; - } - } -#else - dir = "."; -#endif - - return dir; -} - /* ------------------------------------------------------------------------- */ /* path manipulation functions */ @@ -2799,7 +2767,7 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info) char *getErrorFilename(char *basename) { - return getPath2(getUserDataDir(), basename); + return getPath2(getUserGameDataDir(), basename); } void openErrorFile()