projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rnd-20030803-2-src
[rocksndiamonds.git] / src / libgame / image.c
diff --git a/src/libgame/image.c b/src/libgame/image.c
index 64dc3c416d4fe11a4fdd5eea5a8f64e3213041d2..f06a126ec6171fbcdc74014af811cc39c79ca202 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -586,9 +586,13 @@ void ZoomPixmap(Display *display, GC gc, Pixmap src_pixmap, Pixmap dst_pixmap,
   int zoom_factor = src_width / dst_width;     /* currently very limited! */
   int row_skip, col_skip;
 
+  /* adjust source image size to integer multiple of destination image size */
+  src_width  = dst_width  * zoom_factor;
+  src_height = dst_height * zoom_factor;
+
   /* copy source pixmap to temporary image */
-  src_ximage = XGetImage(display, src_pixmap, 0, 0,
-                        src_width, src_height, AllPlanes, ZPixmap);
+  src_ximage = XGetImage(display, src_pixmap, 0, 0, src_width, src_height,
+                        AllPlanes, ZPixmap);
 
   bits_per_pixel = src_ximage->bits_per_pixel;
   bytes_per_pixel = (bits_per_pixel + 7) / 8;
@@ -609,12 +613,12 @@ void ZoomPixmap(Display *display, GC gc, Pixmap src_pixmap, Pixmap dst_pixmap,
   /* scale image down by scaling factor 'zoom_factor' */
   for (y=0; y < src_height; y += zoom_factor, src_ptr += row_skip)
     for (x=0; x < src_width; x += zoom_factor, src_ptr += col_skip)
-      for (i=0; i<bytes_per_pixel; i++)
+      for (i=0; i < bytes_per_pixel; i++)
        *dst_ptr++ = *src_ptr++;
 
   /* copy scaled image to destination pixmap */
   XPutImage(display, dst_pixmap, gc, dst_ximage, 0, 0, 0, 0,
-           MIN(src_width, dst_width), MIN(src_height, dst_height));
+           dst_width, dst_height);
 
   /* free temporary images */
   XDestroyImage(src_ximage);
@@ -699,7 +703,7 @@ int Read_PCX_to_Pixmap(Display *display, Window window, GC gc, char *filename,
 
 
 /* ========================================================================= */
-/* PLATFORM INDEPENDANT IMAGE FUNCTIONS                                      */
+/* PLATFORM INDEPENDENT IMAGE FUNCTIONS                                      */
 /* ========================================================================= */
 
 struct ImageInfo
@@ -708,6 +712,7 @@ struct ImageInfo
   int num_references;
 
   Bitmap *bitmap;
+  boolean contains_small_images;
 };
 typedef struct ImageInfo ImageInfo;
 
@@ -733,6 +738,8 @@ static void *Load_PCX(char *filename)
 
   img_info->source_filename = getStringCopy(filename);
 
+  img_info->contains_small_images = FALSE;
+
   return img_info;
 }
 
@@ -767,8 +774,20 @@ struct FileInfo *getImageListEntry(int pos)
          &image_info->dynamic_file_list[list_pos]);
 }
 
+static ImageInfo *getImageInfoEntryFromImageID(int pos)
+{
+  int num_list_entries = image_info->num_file_list_entries;
+  int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+  ImageInfo **img_info =
+    (ImageInfo **)(pos < num_list_entries ? image_info->artwork_list :
+                  image_info->dynamic_artwork_list);
+
+  return img_info[list_pos];
+}
+
 Bitmap *getBitmapFromImageID(int pos)
 {
+#if 0
   int num_list_entries = image_info->num_file_list_entries;
   int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
   ImageInfo **img_info =
@@ -776,13 +795,38 @@ Bitmap *getBitmapFromImageID(int pos)
                   image_info->dynamic_artwork_list);
 
   return (img_info[list_pos] != NULL ? img_info[list_pos]->bitmap : NULL);
+#else
+  ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+  return (img_info != NULL ? img_info->bitmap : NULL);
+#endif
 }
 
 char *getTokenFromImageID(int graphic)
 {
+#if 0
+  /* !!! this does not work for dynamic artwork (crash!) !!! */
   struct FileInfo *file_list = (struct FileInfo *)image_info->file_list;
 
   return file_list[graphic].token;
+#else
+  struct FileInfo *file_list = getImageListEntry(graphic);
+
+  return (file_list != NULL ? file_list->token : NULL);
+#endif
+}
+
+int getImageIDFromToken(char *token)
+{
+  struct FileInfo *file_list = image_info->file_list;
+  int num_list_entries = image_info->num_file_list_entries;
+  int i;
+
+  for (i=0; i < num_list_entries; i++)
+    if (strcmp(file_list[i].token, token) == 0)
+      return i;
+
+  return -1;
 }
 
 char *getImageConfigFilename()
@@ -802,9 +846,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 **base_prefixes, char **ext1_suffixes,
+                  char **ext2_suffixes, char **ext3_suffixes,
+                  char **ignore_tokens)
 {
   int i;
 
@@ -817,7 +861,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;
 
@@ -841,9 +885,19 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   for (i=0; ext2_suffixes[i] != NULL; i++)
     image_info->num_ext2_suffixes++;
 
+  image_info->num_ext3_suffixes = 0;
+  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;
 
@@ -865,23 +919,6 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   image_info->free_artwork = FreeImage;
 }
 
-void dumpImages()
-{
-  struct ListNode *node;
-
-  if (image_info->content_list == NULL)
-    return;
-
-  for (node = image_info->content_list; node != NULL; node = node->next)
-  {
-    ImageInfo *img_info = (ImageInfo *)node->content;
-
-    printf("---> '%s' [%d]\n",
-          img_info->source_filename,
-          img_info->num_references);
-  }
-}
-
 void ReloadCustomImages()
 {
 #if 0
@@ -890,8 +927,22 @@ void ReloadCustomImages()
 
   LoadArtworkConfig(image_info);
   ReloadCustomArtworkList(image_info);
+}
 
-  dumpImages();
+void CreateImageWithSmallImages(int pos)
+{
+  ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+  if (img_info == NULL || img_info->contains_small_images)
+    return;
+
+  CreateBitmapWithSmallBitmaps(img_info->bitmap);
+
+  img_info->contains_small_images = TRUE;
+
+#if 0
+  printf("CreateImageWithSmallImages: '%s' done\n", img_info->source_filename);
+#endif
 }
 
 void FreeAllImages()
Rocks'n'Diamonds