X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a4c95d26d0cabc1219aabfc2b98624155df29c2b;hb=c8689f0335cd584d24570046c6eb5a3b75701305;hp=0788345993944f363825f4ca4744ae852812f5b8;hpb=84b4d1874b7dfed42ace079941a65baea0ac4ff6;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 07883459..a4c95d26 100644 --- a/src/main.c +++ b/src/main.c @@ -178,6 +178,7 @@ SetupFileHash *element_token_hash = NULL; SetupFileHash *graphic_token_hash = NULL; SetupFileHash *font_token_hash = NULL; SetupFileHash *hide_setup_hash = NULL; +SetupFileHash *anim_url_hash = NULL; // ---------------------------------------------------------------------------- @@ -7798,9 +7799,6 @@ static void InitProgramConfig(char *command_filename) char *config_filename = getProgramConfigFilename(command_filename); char *userdata_basename = getBaseNameNoSuffix(command_filename); char *userdata_subdir; -#if defined(PLATFORM_UNIX) - char *userdata_subdir_unix; -#endif // read default program config, if existing if (fileExists(config_filename)) @@ -7818,11 +7816,6 @@ static void InitProgramConfig(char *command_filename) LoadSetupFromFilename(config_filename); } -#if defined(PLATFORM_UNIX) - // set user data directory for Linux/Unix (but not Mac OS X) - userdata_subdir_unix = getStringCat2(".", userdata_basename); -#endif - // set program title from potentially redefined program title if (setup.internal.program_title != NULL && strlen(setup.internal.program_title) > 0) @@ -7838,10 +7831,10 @@ static void InitProgramConfig(char *command_filename) strlen(setup.internal.program_icon_file) > 0) program_icon_file = getStringCopy(setup.internal.program_icon_file); -#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX) +#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN) userdata_subdir = program_title; #elif defined(PLATFORM_UNIX) - userdata_subdir = userdata_subdir_unix; + userdata_subdir = getStringCat2(".", userdata_basename); #else userdata_subdir = USERDATA_DIRECTORY_OTHER; #endif