X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=824c0b594c070f8e0349f42374d2f9065b79d187;hb=3264a0dc5f07a6873bd99fb094b48879d4e6ed6b;hp=eafc7dc3b8b55407081a289ec1a1dd01f1f67220;hpb=3a9d10b4dd46c7f77112f4497afd09ef59609134;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index eafc7dc3..824c0b59 100644 --- a/src/main.c +++ b/src/main.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // main.c // ============================================================================ @@ -6269,6 +6269,16 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "df_wooden_wall", "wooden wall (DF style)", }, + { + "spring.left", + "spring", + "spring (starts moving left)" + }, + { + "spring.right", + "spring", + "spring (starts moving right)" + }, // -------------------------------------------------------------------------- // "real" (and therefore drawable) runtime elements @@ -7689,7 +7699,9 @@ 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)) @@ -7707,8 +7719,10 @@ 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 &&