X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fmisc.c;h=3bbf74a75ad58af039a922e253a342f81aa523d4;hb=29685c7d5f58315e51bb09029793979fc89e8c9c;hp=c4b351e7a72bf00e791c6fda8ae1c711d54fbf32;hpb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index c4b351e7..3bbf74a7 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1544,7 +1544,7 @@ void deleteNodeFromList(ListNode **node_first, char *key, if (strEqual((*node_first)->key, key)) { - free((*node_first)->key); + checked_free((*node_first)->key); if (destructor_function) destructor_function((*node_first)->content); *node_first = (*node_first)->next; @@ -1761,6 +1761,12 @@ int get_parameter_value(char *value_raw, char *suffix, int type) strEqual(value, "up") ? MV_UP : strEqual(value, "down") ? MV_DOWN : MV_NONE); } + else if (strEqual(suffix, ".align")) + { + result = (strEqual(value, "left") ? ALIGN_LEFT : + strEqual(value, "right") ? ALIGN_RIGHT : + strEqual(value, "center") ? ALIGN_CENTER : ALIGN_DEFAULT); + } else if (strEqual(suffix, ".anim_mode")) { result = (string_has_parameter(value, "none") ? ANIM_NONE : @@ -1774,6 +1780,9 @@ int get_parameter_value(char *value_raw, char *suffix, int type) string_has_parameter(value, "ce_delay") ? ANIM_CE_DELAY : string_has_parameter(value, "horizontal") ? ANIM_HORIZONTAL : string_has_parameter(value, "vertical") ? ANIM_VERTICAL : + string_has_parameter(value, "centered") ? ANIM_CENTERED : + string_has_parameter(value, "fade") ? ANIM_FADE : + string_has_parameter(value, "crossfade") ? ANIM_CROSSFADE : ANIM_DEFAULT); if (string_has_parameter(value, "reverse")) @@ -2726,14 +2735,11 @@ char *getErrorFilename(char *basename) void openErrorFile() { - /* always start with reliable default values */ - program.error_file = stderr; + InitUserDataDirectory(); -#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS) if ((program.error_file = fopen(program.error_filename, MODE_WRITE)) == NULL) fprintf_newline(stderr, "ERROR: cannot open file '%s' for writing!", program.error_filename); -#endif } void closeErrorFile()