rnd-20030304-2-src

[rocksndiamonds.git] / src / libgame / image.c

diff --git a/src/libgame/image.c b/src/libgame/image.c
index c77924c93fc59ec3b15b94fd7d98e831d5ee4dd4..c841ffed244c9fc66fecc62feda0c463a59120df 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -822,10 +822,9 @@ struct PropertyMapping *getImageListPropertyMapping()
 
 void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
                   struct ConfigInfo *config_suffix_list,
-                  char **base_prefixes,
-                  char **ext1_suffixes,
-                  char **ext2_suffixes,
-                  char **ext3_suffixes)
+                  char **base_prefixes, char **ext1_suffixes,
+                  char **ext2_suffixes, char **ext3_suffixes,
+                  char **ignore_tokens)
 {
   int i;
 
@@ -838,7 +837,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   image_info->num_dynamic_file_list_entries = 0;
 
   image_info->file_list =
-    getFileListFromConfigList(config_list, config_suffix_list,
+    getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
                              num_file_list_entries);
   image_info->dynamic_file_list = NULL;
 
@@ -866,10 +865,15 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   for (i=0; ext3_suffixes[i] != NULL; i++)
     image_info->num_ext3_suffixes++;
 
+  image_info->num_ignore_tokens = 0;
+  for (i=0; ignore_tokens[i] != NULL; i++)
+    image_info->num_ignore_tokens++;
+
   image_info->base_prefixes = base_prefixes;
   image_info->ext1_suffixes = ext1_suffixes;
   image_info->ext2_suffixes = ext2_suffixes;
   image_info->ext3_suffixes = ext3_suffixes;
+  image_info->ignore_tokens = ignore_tokens;
 
   image_info->num_property_mapping_entries = 0;
 
@@ -908,13 +912,13 @@ void CreateImageWithSmallImages(int pos)
   if (img_info == NULL || img_info->contains_small_images)
     return;
 
-#if 0
-  printf("    creating small image for '%s'\n", img_info->source_filename);
-#endif
-
   CreateBitmapWithSmallBitmaps(img_info->bitmap);
 
   img_info->contains_small_images = TRUE;
+
+#if 0
+  printf("CreateImageWithSmallImages: '%s' done\n", img_info->source_filename);
+#endif
 }
 
 void FreeAllImages()