X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=31adce34c6a1eec5f5ace6f68870628128e45b20;hp=38c062dec0724f267527d79649c54c78e8bfb1fc;hb=14d7691c65ca4a466ce9b9448153e8fbe8351a81;hpb=8bee1f8bc2232bd6775c402f9f630e92d901593f diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 38c062de..31adce34 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* misc.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// misc.c +// ============================================================================ #include #include @@ -223,43 +221,14 @@ boolean getTokenValueFromString(char *string, char **token, char **value) /* counter functions */ /* ------------------------------------------------------------------------- */ -#if defined(PLATFORM_MSDOS) -volatile unsigned int counter = 0; - -void increment_counter() -{ - counter++; -} - -END_OF_FUNCTION(increment_counter); -#endif - - /* maximal allowed length of a command line option */ #define MAX_OPTION_LEN 256 -#if 1 - -#if defined(TARGET_SDL) static unsigned int getCurrentMS() { return SDL_GetTicks(); } -#else /* !TARGET_SDL */ - -#if defined(PLATFORM_UNIX) -static unsigned int getCurrentMS() -{ - struct timeval current_time; - - gettimeofday(¤t_time, NULL); - - return current_time.tv_sec * 1000 + current_time.tv_usec / 1000; -} -#endif /* PLATFORM_UNIX */ -#endif /* !TARGET_SDL */ - static unsigned int mainCounter(int mode) { static unsigned int base_ms = 0; @@ -276,69 +245,14 @@ static unsigned int mainCounter(int mode) return current_ms - base_ms; } -#else - -#if defined(TARGET_SDL) -static unsigned int mainCounter(int mode) -{ - static unsigned int base_ms = 0; - unsigned int current_ms; - unsigned int counter_ms; - - current_ms = SDL_GetTicks(); - - /* reset base time in case of counter initializing or wrap-around */ - if (mode == INIT_COUNTER || current_ms < base_ms) - base_ms = current_ms; - - counter_ms = current_ms - base_ms; - - return counter_ms; /* return milliseconds since last init */ -} - -#else /* !TARGET_SDL */ - -#if defined(PLATFORM_UNIX) -static unsigned int mainCounter(int mode) -{ - static struct timeval base_time = { 0, 0 }; - struct timeval current_time; - unsigned int counter_ms; - - gettimeofday(¤t_time, NULL); - - /* reset base time in case of counter initializing or wrap-around */ - if (mode == INIT_COUNTER || current_time.tv_sec < base_time.tv_sec) - base_time = current_time; - - counter_ms = (current_time.tv_sec - base_time.tv_sec) * 1000 - + (current_time.tv_usec - base_time.tv_usec) / 1000; - - return counter_ms; /* return milliseconds since last init */ -} -#endif /* PLATFORM_UNIX */ -#endif /* !TARGET_SDL */ - -#endif - void InitCounter() /* set counter back to zero */ { -#if !defined(PLATFORM_MSDOS) mainCounter(INIT_COUNTER); -#else - LOCK_VARIABLE(counter); - LOCK_FUNCTION(increment_counter); - install_int_ex(increment_counter, BPS_TO_TIMER(100)); -#endif } unsigned int Counter() /* get milliseconds since last call of InitCounter() */ { -#if !defined(PLATFORM_MSDOS) return mainCounter(READ_COUNTER); -#else - return (counter * 10); -#endif } static void sleep_milliseconds(unsigned int milliseconds_delay) @@ -360,19 +274,7 @@ static void sleep_milliseconds(unsigned int milliseconds_delay) } else { -#if defined(TARGET_SDL) SDL_Delay(milliseconds_delay); -#elif defined(TARGET_ALLEGRO) - rest(milliseconds_delay); -#else - struct timeval delay; - - delay.tv_sec = milliseconds_delay / 1000; - delay.tv_usec = 1000 * (milliseconds_delay % 1000); - - if (select(0, NULL, NULL, NULL, &delay) != 0) - Error(ERR_WARN, "sleep_milliseconds(): select() failed"); -#endif } } @@ -448,15 +350,11 @@ unsigned int init_random_number(int nr, int seed) seed += (int)current_time.tv_usec; // microseconds since the epoch #endif -#if defined(TARGET_SDL) /* add some more randomness */ seed += (int)SDL_GetTicks(); // milliseconds since SDL init -#endif -#if 1 /* add some more randomness */ seed += GetSimpleRandom(1000000); -#endif } srandom_linux_libc(nr, (unsigned int) seed); @@ -474,7 +372,7 @@ unsigned int get_random_number(int nr, int max) /* system info functions */ /* ------------------------------------------------------------------------- */ -#if !defined(PLATFORM_MSDOS) && !defined(PLATFORM_ANDROID) +#if !defined(PLATFORM_ANDROID) static char *get_corrected_real_name(char *real_name) { char *real_name_new = checked_malloc(MAX_USERNAME_LEN + 1); @@ -489,9 +387,9 @@ static char *get_corrected_real_name(char *real_name) if (*from_ptr == ',') break; - /* the user's real name may contain 'ß' characters (german sharp s), + /* the user's real name may contain 'german sharp s' characters, which have no equivalent in upper case letters (used by our fonts) */ - if (*from_ptr == 'ß') + if (*from_ptr == CHAR_BYTE_SHARP_S) { from_ptr++; *to_ptr++ = 's'; @@ -824,13 +722,14 @@ boolean strSuffixLower(char *s, char *suffix) /* command line option handling functions */ /* ------------------------------------------------------------------------- */ -void GetOptions(char *argv[], void (*print_usage_function)(void)) +void GetOptions(char *argv[], + void (*print_usage_function)(void), + void (*print_version_function)(void)) { char *ro_base_path = RO_BASE_PATH; char *rw_base_path = RW_BASE_PATH; char **options_left = &argv[1]; -#if 1 /* if the program is configured to start from current directory (default), determine program package directory from program binary (some versions of KDE/Konqueror and Mac OS X (especially "Mavericks") apparently do not @@ -840,22 +739,6 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) ro_base_path = getProgramMainDataPath(); if (strEqual(rw_base_path, ".")) rw_base_path = getProgramMainDataPath(); -#else - -#if !defined(PLATFORM_MACOSX) - /* if the program is configured to start from current directory (default), - determine program package directory (KDE/Konqueror does not do this by - itself and fails otherwise); on Mac OS X, the program binary is stored - in an application package directory -- do not try to use this directory - as the program data directory (Mac OS X handles this correctly anyway) */ - - if (strEqual(ro_base_path, ".")) - ro_base_path = program.command_basepath; - if (strEqual(rw_base_path, ".")) - rw_base_path = program.command_basepath; -#endif - -#endif /* initialize global program options */ options.display_name = NULL; @@ -877,7 +760,6 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) options.network = FALSE; options.verbose = FALSE; options.debug = FALSE; - options.debug_x11_sync = FALSE; #if 1 options.verbose = TRUE; @@ -921,7 +803,9 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) option_len = strlen(option); if (strEqual(option, "-")) + { Error(ERR_EXIT_HELP, "unrecognized option '%s'", option); + } else if (strncmp(option, "-help", option_len) == 0) { print_usage_function(); @@ -999,36 +883,24 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) { options.serveronly = TRUE; } - else if (strncmp(option, "-verbose", option_len) == 0) - { - options.verbose = TRUE; - } else if (strncmp(option, "-debug", option_len) == 0) { options.debug = TRUE; } - else if (strncmp(option, "-debug-x11-sync", option_len) == 0) + else if (strncmp(option, "-verbose", option_len) == 0) + { + options.verbose = TRUE; + } + else if (strncmp(option, "-version", option_len) == 0 || + strncmp(option, "-V", option_len) == 0) { - options.debug_x11_sync = TRUE; + print_version_function(); + + exit(0); } else if (strPrefix(option, "-D")) { -#if 1 options.special_flags = getStringCopy(&option[2]); -#else - char *flags_string = &option[2]; - unsigned int flags_value; - - if (*flags_string == '\0') - Error(ERR_EXIT_HELP, "empty flag ignored"); - - flags_value = get_special_flags_function(flags_string); - - if (flags_value == 0) - Error(ERR_EXIT_HELP, "unknown flag '%s'", flags_string); - - options.special_flags |= flags_value; -#endif } else if (strncmp(option, "-execute", option_len) == 0) { @@ -1100,11 +972,9 @@ void Error(int mode, char *format, ...) ANDROID_LOG_UNKNOWN); #endif -#if 1 /* display warnings only when running in verbose mode */ if (mode & ERR_WARN && !options.verbose) return; -#endif if (mode == ERR_INFO_LINE) { @@ -1254,22 +1124,11 @@ inline void swap_number_pairs(int *x1, int *y1, int *x2, int *y2) of the (not yet written) chunk, write the correct chunk size and finally write the chunk itself */ -#if 1 - int getFile8BitInteger(File *file) { return getByteFromFile(file); } -#else - -int getFile8BitInteger(FILE *file) -{ - return fgetc(file); -} - -#endif - int putFile8BitInteger(FILE *file, int value) { if (file != NULL) @@ -1278,8 +1137,6 @@ int putFile8BitInteger(FILE *file, int value) return 1; } -#if 1 - int getFile16BitInteger(File *file, int byte_order) { if (byte_order == BYTE_ORDER_BIG_ENDIAN) @@ -1290,20 +1147,6 @@ int getFile16BitInteger(File *file, int byte_order) (getByteFromFile(file) << 8)); } -#else - -int getFile16BitInteger(FILE *file, int byte_order) -{ - if (byte_order == BYTE_ORDER_BIG_ENDIAN) - return ((fgetc(file) << 8) | - (fgetc(file) << 0)); - else /* BYTE_ORDER_LITTLE_ENDIAN */ - return ((fgetc(file) << 0) | - (fgetc(file) << 8)); -} - -#endif - int putFile16BitInteger(FILE *file, int value, int byte_order) { if (file != NULL) @@ -1323,8 +1166,6 @@ int putFile16BitInteger(FILE *file, int value, int byte_order) return 2; } -#if 1 - int getFile32BitInteger(File *file, int byte_order) { if (byte_order == BYTE_ORDER_BIG_ENDIAN) @@ -1339,24 +1180,6 @@ int getFile32BitInteger(File *file, int byte_order) (getByteFromFile(file) << 24)); } -#else - -int getFile32BitInteger(FILE *file, int byte_order) -{ - if (byte_order == BYTE_ORDER_BIG_ENDIAN) - return ((fgetc(file) << 24) | - (fgetc(file) << 16) | - (fgetc(file) << 8) | - (fgetc(file) << 0)); - else /* BYTE_ORDER_LITTLE_ENDIAN */ - return ((fgetc(file) << 0) | - (fgetc(file) << 8) | - (fgetc(file) << 16) | - (fgetc(file) << 24)); -} - -#endif - int putFile32BitInteger(FILE *file, int value, int byte_order) { if (file != NULL) @@ -1380,8 +1203,6 @@ int putFile32BitInteger(FILE *file, int value, int byte_order) return 4; } -#if 1 - boolean getFileChunk(File *file, char *chunk_name, int *chunk_size, int byte_order) { @@ -1400,28 +1221,6 @@ boolean getFileChunk(File *file, char *chunk_name, int *chunk_size, return (checkEndOfFile(file) ? FALSE : TRUE); } -#else - -boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size, - int byte_order) -{ - const int chunk_name_length = 4; - - /* read chunk name */ - if (fgets(chunk_name, chunk_name_length + 1, file) == NULL) - return FALSE; - - if (chunk_size != NULL) - { - /* read chunk size */ - *chunk_size = getFile32BitInteger(file, byte_order); - } - - return (feof(file) || ferror(file) ? FALSE : TRUE); -} - -#endif - int putFileChunk(FILE *file, char *chunk_name, int chunk_size, int byte_order) { @@ -1445,8 +1244,6 @@ int putFileChunk(FILE *file, char *chunk_name, int chunk_size, return num_bytes; } -#if 1 - int getFileVersion(File *file) { int version_major = getByteFromFile(file); @@ -1458,21 +1255,6 @@ int getFileVersion(File *file) version_build); } -#else - -int getFileVersion(FILE *file) -{ - int version_major = fgetc(file); - int version_minor = fgetc(file); - int version_patch = fgetc(file); - int version_build = fgetc(file); - - return VERSION_IDENT(version_major, version_minor, version_patch, - version_build); -} - -#endif - int putFileVersion(FILE *file, int version) { if (file != NULL) @@ -1491,8 +1273,6 @@ int putFileVersion(FILE *file, int version) return 4; } -#if 1 - void ReadBytesFromFile(File *file, byte *buffer, unsigned int bytes) { int i; @@ -1501,18 +1281,6 @@ void ReadBytesFromFile(File *file, byte *buffer, unsigned int bytes) buffer[i] = getByteFromFile(file); } -#else - -void ReadBytesFromFile(FILE *file, byte *buffer, unsigned int bytes) -{ - int i; - - for(i = 0; i < bytes && !feof(file); i++) - buffer[i] = fgetc(file); -} - -#endif - void WriteBytesToFile(FILE *file, byte *buffer, unsigned int bytes) { int i; @@ -1521,24 +1289,12 @@ void WriteBytesToFile(FILE *file, byte *buffer, unsigned int bytes) fputc(buffer[i], file); } -#if 1 - void ReadUnusedBytesFromFile(File *file, unsigned int bytes) { while (bytes-- && !checkEndOfFile(file)) getByteFromFile(file); } -#else - -void ReadUnusedBytesFromFile(FILE *file, unsigned int bytes) -{ - while (bytes-- && !feof(file)) - fgetc(file); -} - -#endif - void WriteUnusedBytesToFile(FILE *file, unsigned int bytes) { while (bytes--) @@ -1657,14 +1413,14 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode) { KSYM_braceright, "XK_braceright", "brace right" }, { KSYM_asciitilde, "XK_asciitilde", "~" }, - /* special (non-ASCII) keys (ISO-Latin-1) */ - { KSYM_degree, "XK_degree", "°" }, - { KSYM_Adiaeresis, "XK_Adiaeresis", "Ä" }, - { KSYM_Odiaeresis, "XK_Odiaeresis", "Ö" }, - { KSYM_Udiaeresis, "XK_Udiaeresis", "Ü" }, - { KSYM_adiaeresis, "XK_adiaeresis", "ä" }, - { KSYM_odiaeresis, "XK_odiaeresis", "ö" }, - { KSYM_udiaeresis, "XK_udiaeresis", "ü" }, + /* special (non-ASCII) keys */ + { KSYM_degree, "XK_degree", "degree" }, + { KSYM_Adiaeresis, "XK_Adiaeresis", "A umlaut" }, + { KSYM_Odiaeresis, "XK_Odiaeresis", "O umlaut" }, + { KSYM_Udiaeresis, "XK_Udiaeresis", "U umlaut" }, + { KSYM_adiaeresis, "XK_adiaeresis", "a umlaut" }, + { KSYM_odiaeresis, "XK_odiaeresis", "o umlaut" }, + { KSYM_udiaeresis, "XK_udiaeresis", "u umlaut" }, { KSYM_ssharp, "XK_ssharp", "sharp s" }, #if defined(TARGET_SDL2) @@ -1938,6 +1694,26 @@ Key getKeyFromX11KeyName(char *x11name) char getCharFromKey(Key key) { + static struct + { + Key key; + byte key_char; + } translate_key_char[] = + { + /* special (non-ASCII) keys (ISO-8859-1) */ + { KSYM_degree, CHAR_BYTE_DEGREE }, + { KSYM_Adiaeresis, CHAR_BYTE_UMLAUT_A }, + { KSYM_Odiaeresis, CHAR_BYTE_UMLAUT_O }, + { KSYM_Udiaeresis, CHAR_BYTE_UMLAUT_U }, + { KSYM_adiaeresis, CHAR_BYTE_UMLAUT_a }, + { KSYM_odiaeresis, CHAR_BYTE_UMLAUT_o }, + { KSYM_udiaeresis, CHAR_BYTE_UMLAUT_u }, + { KSYM_ssharp, CHAR_BYTE_SHARP_S }, + + /* end-of-array identifier */ + { 0, 0 } + }; + char *keyname = getKeyNameFromKey(key); char c = 0; @@ -1945,6 +1721,21 @@ char getCharFromKey(Key key) c = keyname[0]; else if (strEqual(keyname, "space")) c = ' '; + else + { + int i = 0; + + do + { + if (key == translate_key_char[i].key) + { + c = translate_key_char[i].key_char; + + break; + } + } + while (translate_key_char[++i].key_char); + } return c; } @@ -2392,12 +2183,6 @@ DirectoryEntry *readDirectory(Directory *dir) (stat(dir->dir_entry->filename, &file_status) == 0 && (file_status.st_mode & S_IFMT) == S_IFDIR); -#if 0 - Error(ERR_INFO, "::: '%s' is directory: %d", - dir->dir_entry->basename, - dir->dir_entry->is_directory); -#endif - return dir->dir_entry; } @@ -2509,7 +2294,6 @@ boolean fileHasSuffix(char *basename, char *suffix) return FALSE; } -#if defined(TARGET_SDL) static boolean FileCouldBeArtwork(char *basename) { return (!strEqual(basename, ".") && @@ -2517,57 +2301,26 @@ static boolean FileCouldBeArtwork(char *basename) !fileHasSuffix(basename, "txt") && !fileHasSuffix(basename, "conf")); } -#endif boolean FileIsGraphic(char *filename) { char *basename = getBaseNamePtr(filename); -#if defined(TARGET_SDL) return FileCouldBeArtwork(basename); -#else - return fileHasSuffix(basename, "pcx"); -#endif } boolean FileIsSound(char *filename) { char *basename = getBaseNamePtr(filename); -#if defined(TARGET_SDL) return FileCouldBeArtwork(basename); -#else - return fileHasSuffix(basename, "wav"); -#endif } boolean FileIsMusic(char *filename) { char *basename = getBaseNamePtr(filename); -#if defined(TARGET_SDL) return FileCouldBeArtwork(basename); -#else - if (FileIsSound(basename)) - return TRUE; - -#if 0 -#if defined(TARGET_SDL) - if ((fileHasPrefix(basename, "mod") && !fileHasSuffix(basename, "txt")) || - fileHasSuffix(basename, "mod") || - fileHasSuffix(basename, "s3m") || - fileHasSuffix(basename, "it") || - fileHasSuffix(basename, "xm") || - fileHasSuffix(basename, "midi") || - fileHasSuffix(basename, "mid") || - fileHasSuffix(basename, "mp3") || - fileHasSuffix(basename, "ogg")) - return TRUE; -#endif -#endif - - return FALSE; -#endif } boolean FileIsArtworkType(char *basename, int type) @@ -2715,11 +2468,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type) string_has_parameter(value, "melt") ? FADE_MODE_MELT : FADE_MODE_DEFAULT); } -#if 1 else if (strPrefix(suffix, ".font")) /* (may also be ".font_xyz") */ -#else - else if (strEqualN(suffix, ".font", 5)) /* (may also be ".font_xyz") */ -#endif { result = gfx.get_font_from_token_function(value); } @@ -2829,9 +2578,6 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, for (i = 0; config_list[i].token != NULL; i++) { int len_config_token = strlen(config_list[i].token); -#if 0 - int len_config_value = strlen(config_list[i].value); -#endif boolean is_file_entry = TRUE; for (j = 0; suffix_list[j].token != NULL; j++) @@ -2864,24 +2610,8 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, if (list_pos >= num_file_list_entries) break; -#if 0 - /* simple sanity check if this is really a file definition */ - if (!strEqual(&config_list[i].value[len_config_value - 4], ".pcx") && - !strEqual(&config_list[i].value[len_config_value - 4], ".wav") && - !strEqual(config_list[i].value, UNDEFINED_FILENAME)) - { - Error(ERR_INFO, "Configuration directive '%s' -> '%s':", - config_list[i].token, config_list[i].value); - Error(ERR_EXIT, "This seems to be no valid definition -- please fix"); - } -#endif - file_list[list_pos].token = config_list[i].token; file_list[list_pos].default_filename = config_list[i].value; - -#if 0 - printf("::: '%s' => '%s'\n", config_list[i].token, config_list[i].value); -#endif } if (strSuffix(config_list[i].token, ".clone_from")) @@ -2900,10 +2630,6 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, Error(ERR_EXIT, "please fix"); } -#if 0 - printf("::: ---------- DONE ----------\n"); -#endif - return file_list; } @@ -3045,10 +2771,6 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, if (filename == NULL) return; -#if 0 - printf("LoadArtworkConfigFromFilename '%s' ...\n", filename); -#endif - if ((setup_file_hash = loadSetupFileHash(filename)) == NULL) return; @@ -3131,10 +2853,6 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, boolean base_prefix_found = FALSE; boolean parameter_suffix_found = FALSE; -#if 0 - printf("::: examining '%s' -> '%s'\n", token, HASH_ITERATION_VALUE(itr)); -#endif - /* skip all parameter definitions (handled by read_token_parameters()) */ for (i = 0; i < num_suffix_list_entries && !parameter_suffix_found; i++) { @@ -3170,20 +2888,10 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, base_index = i; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> MATCH: '%s', '%s'\n", token, base_prefix); -#endif - if (start_pos + len_base_prefix == len_token) /* exact match */ { exact_match = TRUE; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> EXACT MATCH: '%s', '%s'\n", token, base_prefix); -#endif - add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, extra_file_hash, @@ -3197,11 +2905,6 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, continue; } -#if 0 - if (IS_PARENT_PROCESS()) - printf("---> examining token '%s': search 1st suffix ...\n", token); -#endif - /* ---------- step 1: search for matching first suffix ---------- */ start_pos += len_base_prefix; @@ -3217,20 +2920,10 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, ext1_index = j; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> MATCH: '%s', '%s'\n", token, ext1_suffix); -#endif - if (start_pos + len_ext1_suffix == len_token) /* exact match */ { exact_match = TRUE; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> EXACT MATCH: '%s', '%s'\n", token, ext1_suffix); -#endif - add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, extra_file_hash, @@ -3250,11 +2943,6 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, if (exact_match) break; -#if 0 - if (IS_PARENT_PROCESS()) - printf("---> examining token '%s': search 2nd suffix ...\n", token); -#endif - /* ---------- step 2: search for matching second suffix ---------- */ for (k = 0; k < num_ext2_suffixes && !ext2_suffix_found; k++) @@ -3269,20 +2957,10 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, ext2_index = k; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> MATCH: '%s', '%s'\n", token, ext2_suffix); -#endif - if (start_pos + len_ext2_suffix == len_token) /* exact match */ { exact_match = TRUE; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> EXACT MATCH: '%s', '%s'\n", token, ext2_suffix); -#endif - add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, extra_file_hash, @@ -3302,11 +2980,6 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, if (exact_match) break; -#if 0 - if (IS_PARENT_PROCESS()) - printf("---> examining token '%s': search 3rd suffix ...\n",token); -#endif - /* ---------- step 3: search for matching third suffix ---------- */ for (l = 0; l < num_ext3_suffixes && !ext3_suffix_found; l++) @@ -3321,20 +2994,10 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, ext3_index = l; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> MATCH: '%s', '%s'\n", token, ext3_suffix); -#endif - if (start_pos + len_ext3_suffix == len_token) /* exact match */ { exact_match = TRUE; -#if 0 - if (IS_PARENT_PROCESS()) - printf("===> EXACT MATCH: '%s', '%s'\n", token, ext3_suffix); -#endif - add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, extra_file_hash, @@ -3434,17 +3097,6 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, freeSetupFileHash(extra_file_hash); freeSetupFileHash(empty_file_hash); - -#if 0 - for (i = 0; i < num_file_list_entries; i++) - { - printf("'%s' ", file_list[i].token); - if (file_list[i].filename) - printf("-> '%s'\n", file_list[i].filename); - else - printf("-> UNDEFINED [-> '%s']\n", file_list[i].default_filename); - } -#endif } void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) @@ -3496,21 +3148,11 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) artwork_info->num_property_mapping_entries = 0; } -#if 1 if (!GFX_OVERRIDE_ARTWORK(artwork_info->type)) -#else - if (!SETUP_OVERRIDE_ARTWORK(setup, artwork_info->type)) -#endif { /* first look for special artwork configured in level series config */ filename_base = getCustomArtworkLevelConfigFilename(artwork_info->type); -#if 0 - printf("::: filename_base == '%s' [%s, %s]\n", filename_base, - leveldir_current->graphics_set, - leveldir_current->graphics_path); -#endif - if (fileExists(filename_base)) LoadArtworkConfigFromFilename(artwork_info, filename_base); } @@ -3604,23 +3246,15 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, This usually means that this artwork does not exist in this artwork set and a fallback to the existing artwork is done. */ -#if 0 - printf("[artwork '%s' already exists (same list entry)]\n", filename); -#endif - return; } /* delete existing artwork file entry */ deleteArtworkListEntry(artwork_info, listnode); - /* check if the new artwork file already exists in the list of artworks */ + /* check if the new artwork file already exists in the list of artwork */ if ((node = getNodeFromKey(artwork_info->content_list, filename)) != NULL) { -#if 0 - printf("[artwork '%s' already exists (other list entry)]\n", filename); -#endif - *listnode = (struct ListNodeInfo *)node->content; (*listnode)->num_references++; @@ -3632,10 +3266,7 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, if ((*listnode = artwork_info->load_artwork(filename)) != NULL) { -#if 0 - printf("[adding new artwork '%s']\n", filename); -#endif - + /* add new artwork file entry to the list of artwork files */ (*listnode)->num_references = 1; addNodeToList(&artwork_info->content_list, (*listnode)->source_filename, *listnode); @@ -3658,10 +3289,6 @@ static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, struct ListNodeInfo **listnode, struct FileInfo *file_list_entry) { -#if 0 - printf("GOT CUSTOM ARTWORK FILE '%s'\n", file_list_entry->filename); -#endif - if (strEqual(file_list_entry->filename, UNDEFINED_FILENAME)) { deleteArtworkListEntry(artwork_info, listnode); @@ -3750,6 +3377,9 @@ void openErrorFile() Error(ERR_WARN, "cannot open file '%s' for writing: %s", program.error_filename, strerror(errno)); } + + /* error output should be unbuffered so it is not truncated in a crash */ + setbuf(program.error_file, NULL); } void closeErrorFile() @@ -3858,11 +3488,7 @@ void debug_print_timestamp(int counter_nr, char *message) counter[counter_nr][1] = counter[counter_nr][0]; if (message) -#if 1 Error(ERR_DEBUG, "%s%s%s %.3f %s", -#else - printf("%s%s%s %.3f %s\n", -#endif debug_print_timestamp_get_padding(counter_nr * indent_size), message, debug_print_timestamp_get_padding(padding_size - strlen(message)),