-/***********************************************************
-* 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 <time.h>
#include <sys/time.h>
}
#endif
+static void vfprintf_nonewline(FILE *stream, char *format, va_list ap)
+{
+#if defined(PLATFORM_ANDROID)
+ // (prefix text of logging output is currently skipped on Android)
+ //__android_log_vprint(android_log_prio, program.program_title, format, ap);
+#else
+ va_list ap2;
+ va_copy(ap2, ap);
+
+ vfprintf(stream, format, ap);
+ vfprintf(stderr, format, ap2);
+
+ va_end(ap2);
+#endif
+}
+
static void vfprintf_newline(FILE *stream, char *format, va_list ap)
{
#if defined(PLATFORM_ANDROID)
#else
char *newline = STRING_NEWLINE;
+ va_list ap2;
+ va_copy(ap2, ap);
+
vfprintf(stream, format, ap);
fprintf(stream, "%s", newline);
+
+ vfprintf(stderr, format, ap2);
+ fprintf(stderr, "%s", newline);
+
+ va_end(ap2);
#endif
}
+static void fprintf_nonewline(FILE *stream, char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ vfprintf_nonewline(stream, format, ap);
+ va_end(ap);
+}
+
static void fprintf_newline(FILE *stream, char *format, ...)
{
va_list ap;
int i;
for (i = 0; i < line_length; i++)
- fprintf(stream, "%s", line_chars);
+ fprintf_nonewline(stream, "%s", line_chars);
fprintf_newline(stream, "");
}
/* 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;
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)
}
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
}
}
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);
/* 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);
return getStringCat3WithSeparator(path1, path2, path3, STRING_PATH_SEPARATOR);
}
-char *getStringCopy(char *s)
+char *getStringCopy(const char *s)
{
char *s_copy;
return s_copy;
}
-char *getStringCopyN(char *s, int n)
+char *getStringCopyN(const char *s, int n)
{
char *s_copy;
int s_len = MAX(0, n);
return s_copy;
}
-char *getStringToLower(char *s)
+char *getStringCopyNStatic(const char *s, int n)
+{
+ static char *s_copy = NULL;
+
+ checked_free(s_copy);
+
+ s_copy = getStringCopyN(s, n);
+
+ return s_copy;
+}
+
+char *getStringToLower(const char *s)
{
char *s_copy = checked_malloc(strlen(s) + 1);
char *s_ptr = s_copy;
/* 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
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;
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();
{
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;
{
options.debug_x11_sync = TRUE;
}
+ 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)
+ {
+ 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)
{
/* error handling functions */
/* ------------------------------------------------------------------------- */
+#define MAX_INTERNAL_ERROR_SIZE 1024
+
/* used by SetError() and GetError() to store internal error messages */
-static char internal_error[1024]; /* this is bad */
+static char internal_error[MAX_INTERNAL_ERROR_SIZE];
void SetError(char *format, ...)
{
va_list ap;
va_start(ap, format);
- vsprintf(internal_error, format, ap);
+ vsnprintf(internal_error, MAX_INTERNAL_ERROR_SIZE, format, ap);
va_end(ap);
}
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)
{
{
va_list ap;
- fprintf(program.error_file, "%s%s: ", program.command_basename,
- process_name);
+ fprintf_nonewline(program.error_file, "%s%s: ", program.command_basename,
+ process_name);
if (mode & ERR_WARN)
- fprintf(program.error_file, "warning: ");
+ fprintf_nonewline(program.error_file, "warning: ");
va_start(ap, format);
vfprintf_newline(program.error_file, format, ap);
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)
return 1;
}
-#if 1
-
int getFile16BitInteger(File *file, int byte_order)
{
if (byte_order == BYTE_ORDER_BIG_ENDIAN)
(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)
return 2;
}
-#if 1
-
int getFile32BitInteger(File *file, int byte_order)
{
if (byte_order == BYTE_ORDER_BIG_ENDIAN)
(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)
return 4;
}
-#if 1
-
boolean getFileChunk(File *file, char *chunk_name, int *chunk_size,
int byte_order)
{
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)
{
return num_bytes;
}
-#if 1
-
int getFileVersion(File *file)
{
int version_major = getByteFromFile(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)
return 4;
}
-#if 1
-
void ReadBytesFromFile(File *file, byte *buffer, unsigned int bytes)
{
int i;
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;
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--)
{ KSYM_braceright, "XK_braceright", "brace right" },
{ KSYM_asciitilde, "XK_asciitilde", "~" },
-#if !defined(TARGET_SDL2)
- /* special (non-ASCII) keys */
+ /* special (non-ASCII) keys (ISO-Latin-1) */
{ KSYM_degree, "XK_degree", "°" },
{ KSYM_Adiaeresis, "XK_Adiaeresis", "Ä" },
{ KSYM_Odiaeresis, "XK_Odiaeresis", "Ö" },
{ KSYM_odiaeresis, "XK_odiaeresis", "ö" },
{ KSYM_udiaeresis, "XK_udiaeresis", "ü" },
{ KSYM_ssharp, "XK_ssharp", "sharp s" },
+
+#if defined(TARGET_SDL2)
+ /* special (non-ASCII) keys (UTF-8, for reverse mapping only) */
+ { KSYM_degree, "XK_degree", "\xc2\xb0" },
+ { KSYM_Adiaeresis, "XK_Adiaeresis", "\xc3\x84" },
+ { KSYM_Odiaeresis, "XK_Odiaeresis", "\xc3\x96" },
+ { KSYM_Udiaeresis, "XK_Udiaeresis", "\xc3\x9c" },
+ { KSYM_adiaeresis, "XK_adiaeresis", "\xc3\xa4" },
+ { KSYM_odiaeresis, "XK_odiaeresis", "\xc3\xb6" },
+ { KSYM_udiaeresis, "XK_udiaeresis", "\xc3\xbc" },
+ { KSYM_ssharp, "XK_ssharp", "\xc3\x9f" },
+
+ /* other keys (for reverse mapping only) */
+ { KSYM_space, "XK_space", " " },
+#endif
+
+#if defined(TARGET_SDL2)
+ /* keypad keys are not in numerical order in SDL2 */
+ { KSYM_KP_0, "XK_KP_0", "keypad 0" },
+ { KSYM_KP_1, "XK_KP_1", "keypad 1" },
+ { KSYM_KP_2, "XK_KP_2", "keypad 2" },
+ { KSYM_KP_3, "XK_KP_3", "keypad 3" },
+ { KSYM_KP_4, "XK_KP_4", "keypad 4" },
+ { KSYM_KP_5, "XK_KP_5", "keypad 5" },
+ { KSYM_KP_6, "XK_KP_6", "keypad 6" },
+ { KSYM_KP_7, "XK_KP_7", "keypad 7" },
+ { KSYM_KP_8, "XK_KP_8", "keypad 8" },
+ { KSYM_KP_9, "XK_KP_9", "keypad 9" },
#endif
/* end-of-array identifier */
sprintf(name_buffer, "%c", 'a' + (char)(key - KSYM_a));
else if (key >= KSYM_0 && key <= KSYM_9)
sprintf(name_buffer, "%c", '0' + (char)(key - KSYM_0));
+#if !defined(TARGET_SDL2)
else if (key >= KSYM_KP_0 && key <= KSYM_KP_9)
sprintf(name_buffer, "keypad %c", '0' + (char)(key - KSYM_KP_0));
+#endif
else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST)
sprintf(name_buffer, "F%d", (int)(key - KSYM_FKEY_FIRST + 1));
else if (key == KSYM_UNDEFINED)
sprintf(name_buffer, "XK_%c", 'a' + (char)(key - KSYM_a));
else if (key >= KSYM_0 && key <= KSYM_9)
sprintf(name_buffer, "XK_%c", '0' + (char)(key - KSYM_0));
+#if !defined(TARGET_SDL2)
else if (key >= KSYM_KP_0 && key <= KSYM_KP_9)
sprintf(name_buffer, "XK_KP_%c", '0' + (char)(key - KSYM_KP_0));
+#endif
else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST)
sprintf(name_buffer, "XK_F%d", (int)(key - KSYM_FKEY_FIRST + 1));
else if (key == KSYM_UNDEFINED)
else if (mode == TRANSLATE_KEYNAME_TO_KEYSYM)
{
Key key = KSYM_UNDEFINED;
+ char *name_ptr = *name;
+
+ if (strlen(*name) == 1)
+ {
+ char c = name_ptr[0];
- i = 0;
- do
+ if (c >= 'A' && c <= 'Z')
+ key = KSYM_A + (Key)(c - 'A');
+ else if (c >= 'a' && c <= 'z')
+ key = KSYM_a + (Key)(c - 'a');
+ else if (c >= '0' && c <= '9')
+ key = KSYM_0 + (Key)(c - '0');
+ }
+
+ if (key == KSYM_UNDEFINED)
{
- if (strEqual(translate_key[i].name, *name))
+ i = 0;
+
+ do
{
- key = translate_key[i].key;
- break;
+ if (strEqual(translate_key[i].name, *name))
+ {
+ key = translate_key[i].key;
+ break;
+ }
}
+ while (translate_key[++i].x11name);
}
- while (translate_key[++i].x11name);
if (key == KSYM_UNDEFINED)
Error(ERR_WARN, "getKeyFromKeyName(): not completely implemented");
else if (c >= '0' && c <= '9')
key = KSYM_0 + (Key)(c - '0');
}
+#if !defined(TARGET_SDL2)
else if (strPrefix(name_ptr, "XK_KP_") && strlen(name_ptr) == 7)
{
char c = name_ptr[6];
if (c >= '0' && c <= '9')
key = KSYM_KP_0 + (Key)(c - '0');
}
+#endif
else if (strPrefix(name_ptr, "XK_F") && strlen(name_ptr) <= 6)
{
char c1 = name_ptr[4];
(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;
}
return FALSE;
}
+static boolean FileCouldBeArtwork(char *basename)
+{
+ return (!strEqual(basename, ".") &&
+ !strEqual(basename, "..") &&
+ !fileHasSuffix(basename, "txt") &&
+ !fileHasSuffix(basename, "conf"));
+}
+
boolean FileIsGraphic(char *filename)
{
char *basename = getBaseNamePtr(filename);
-#if defined(TARGET_SDL)
- return (!fileHasSuffix(basename, "txt") &&
- !fileHasSuffix(basename, "conf"));
-#else
- return fileHasSuffix(basename, "pcx");
-#endif
+ return FileCouldBeArtwork(basename);
}
boolean FileIsSound(char *filename)
{
char *basename = getBaseNamePtr(filename);
-#if defined(TARGET_SDL)
- return (!fileHasSuffix(basename, "txt") &&
- !fileHasSuffix(basename, "conf"));
-#else
- return fileHasSuffix(basename, "wav");
-#endif
+ return FileCouldBeArtwork(basename);
}
boolean FileIsMusic(char *filename)
{
char *basename = getBaseNamePtr(filename);
-#if defined(TARGET_SDL)
- return (!fileHasSuffix(basename, "txt") &&
- !fileHasSuffix(basename, "conf"));
-#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
+ return FileCouldBeArtwork(basename);
}
boolean FileIsArtworkType(char *basename, 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);
}
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++)
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"))
Error(ERR_EXIT, "please fix");
}
-#if 0
- printf("::: ---------- DONE ----------\n");
-#endif
-
return file_list;
}
if (filename == NULL)
return;
-#if 0
- printf("LoadArtworkConfigFromFilename '%s' ...\n", filename);
-#endif
-
if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
return;
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++)
{
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,
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;
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,
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++)
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,
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++)
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,
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)
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);
}
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++;
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);
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);
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()
#if DEBUG
-#define DEBUG_PRINT_INIT_TIMESTAMPS TRUE
+#define DEBUG_PRINT_INIT_TIMESTAMPS FALSE
#define DEBUG_PRINT_INIT_TIMESTAMPS_DEPTH 10
#define DEBUG_NUM_TIMESTAMPS 10
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)),
projects / rocksndiamonds.git / blobdiff