{
struct FileInfo *file_list;
int num_suffix_list_entries = 0;
- int list_pos = -1;
+ int list_pos = 0;
int i, j;
file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
/* always start with reliable default values */
for (i=0; i<num_file_list_entries; i++)
{
- file_list[list_pos].token = NULL;
- file_list[list_pos].default_filename = NULL;
- file_list[list_pos].filename = NULL;
+ file_list[i].token = NULL;
+ file_list[i].default_filename = NULL;
+ file_list[i].filename = NULL;
if (num_suffix_list_entries > 0)
{
for (i=0; config_list[i].token != NULL; i++)
{
int len_config_token = strlen(config_list[i].token);
+ int len_config_value = strlen(config_list[i].value);
boolean is_file_entry = TRUE;
for (j=0; suffix_list[j].token != NULL; j++)
if (is_file_entry)
{
- list_pos++;
+ if (i > 0)
+ list_pos++;
- if (list_pos >= num_file_list_entries)
- Error(ERR_EXIT, "inconsistant config list information -- please fix");
+ if (list_pos > num_file_list_entries - 1)
+ break;
+
+ /* simple sanity check if this is really a file definition */
+ if (strcmp(&config_list[i].value[len_config_value - 4], ".pcx") != 0 &&
+ strcmp(&config_list[i].value[len_config_value - 4], ".wav") != 0 &&
+ strcmp(config_list[i].value, UNDEFINED_FILENAME) != 0)
+ {
+ Error(ERR_RETURN, "Configuration directive '%s' -> '%s':",
+ config_list[i].token, config_list[i].value);
+ Error(ERR_EXIT, "This seems to be no valid definition -- please fix");
+ }
file_list[list_pos].token = config_list[i].token;
file_list[list_pos].default_filename = config_list[i].value;
{
for (i=0; i<num_file_list_entries; i++)
{
- file_list[i].filename =
- getStringCopy(getTokenValue(setup_file_list, file_list[i].token));
+ char *filename = getTokenValue(setup_file_list, file_list[i].token);
+
+ if (filename == NULL)
+ filename = file_list[i].default_filename;
+ file_list[i].filename = getStringCopy(filename);
for (j=0; j<num_suffix_list_entries; j++)
{
if (value != NULL)
file_list[i].parameter[j] = atoi(value);
+
+ free(token);
}
}
}
else if ((*listnode = artwork_info->load_artwork(filename)) != NULL)
{
+#if 0
+ printf("[adding new artwork '%s']\n", filename);
+#endif
+
(*listnode)->num_references = 1;
addNodeToList(&artwork_info->content_list, (*listnode)->source_filename,
*listnode);
DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN);
#if 0
- printf("DEBUG: reloading %d sounds ...\n", num_file_list_entries);
+ printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries);
#endif
for(i=0; i<num_file_list_entries; i++)
if (draw_init[artwork_info->type].do_it)
DrawInitText(file_list[i].token, 150, FC_YELLOW);
- if (file_list[i].filename)
- LoadArtworkToList(artwork_info, file_list[i].filename, i);
- else
- LoadArtworkToList(artwork_info, file_list[i].default_filename, i);
+ LoadArtworkToList(artwork_info, file_list[i].filename, i);
+
+#if 0
+ printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename);
+#endif
}
draw_init[artwork_info->type].do_it = FALSE;