X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=0996d10dfea85596e4fdc50b8fb39e380af069e8;hb=e1fdeb57afb3db322b3757d8105c66ba33cadca4;hp=dcf94aaa43d2961368a1e4c961f420bebd3ffe94;hpb=8d93b043cc23f5a580363763ad459913127a8664;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index dcf94aaa..0996d10d 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -170,7 +170,7 @@ static char *getTapeDir(char *level_subdir) static char *getScoreDir(char *level_subdir) { static char *score_dir = NULL; - char *data_dir = options.rw_base_directory; + char *data_dir = getCommonDataDir(); char *score_subdir = SCORES_DIRECTORY; if (score_dir) @@ -437,15 +437,6 @@ static char *getCorrectedImageBasename(char *basename) return basename_corrected; } -static boolean fileExists(char *filename) -{ -#if 0 - printf("checking file '%s'\n", filename); -#endif - - return (access(filename, F_OK) == 0); -} - char *getCustomImageFilename(char *basename) { static char *filename = NULL; @@ -610,6 +601,7 @@ void InitTapeDirectory(char *level_subdir) void InitScoreDirectory(char *level_subdir) { + createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC); createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC); createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC); } @@ -885,15 +877,33 @@ char *getUserDataDir(void) { static char *userdata_dir = NULL; - if (!userdata_dir) + if (userdata_dir == NULL) + userdata_dir = getPath2(getHomeDir(), program.userdata_directory); + + return userdata_dir; +} + +char *getCommonDataDir(void) +{ + static char *common_data_dir = NULL; + +#if defined(PLATFORM_WIN32) + if (common_data_dir == NULL) { - char *home_dir = getHomeDir(); - char *data_dir = program.userdata_directory; + char *dir = checked_malloc(MAX_PATH + 1); - userdata_dir = getPath2(home_dir, data_dir); + if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, 0, dir)) + && strcmp(dir, "") != 0) /* empty for Windows 95/98 */ + common_data_dir = getPath2(dir, program.userdata_directory); + else + common_data_dir = options.rw_base_directory; } +#else + if (common_data_dir == NULL) + common_data_dir = options.rw_base_directory; +#endif - return userdata_dir; + return common_data_dir; } char *getSetupDir() @@ -1105,7 +1115,6 @@ struct SetupFileList *loadSetupFileList(char *filename) char *token, *value, *line_ptr; struct SetupFileList *setup_file_list = newSetupFileList("", ""); struct SetupFileList *first_valid_list_entry; - FILE *file; if (!(file = fopen(filename, MODE_READ)))