// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// https://www.artsoft.org/
// ----------------------------------------------------------------------------
// image.c
// ============================================================================
Bitmap *bitmaps[NUM_IMG_BITMAP_POINTERS];
- int original_width; /* original image file width */
- int original_height; /* original image file height */
+ int original_width; // original image file width
+ int original_height; // original image file height
- boolean contains_small_images; /* set after adding small images */
- boolean contains_textures; /* set after adding GPU textures */
- boolean scaled_up; /* set after scaling up */
+ boolean contains_small_images; // set after adding small images
+ boolean contains_textures; // set after adding GPU textures
+ boolean scaled_up; // set after scaling up
- int conf_tile_size; /* tile size as defined in config */
- int game_tile_size; /* tile size as resized for game */
+ int conf_tile_size; // tile size as defined in config
+ int game_tile_size; // tile size as resized for game
- char *leveldir; /* level set when image was loaded */
+ char *leveldir; // level set when image was loaded
};
typedef struct ImageInfo ImageInfo;
if ((img_info->bitmaps[IMG_BITMAP_STANDARD] = LoadImage(filename)) == NULL)
{
- Error(ERR_WARN, "cannot load image file '%s': LoadImage() failed: %s",
- filename, GetError());
+ Warn("cannot load image file '%s': LoadImage() failed", filename);
free(img_info);
free(image);
}
-int getImageListSize()
+int getImageListSize(void)
{
return (image_info->num_file_list_entries +
image_info->num_dynamic_file_list_entries);
return (file_list != NULL ? file_list->token : NULL);
}
+char *getFilenameFromImageID(int graphic)
+{
+ struct FileInfo *file_list = getImageListEntryFromImageID(graphic);
+
+ return (file_list != NULL ? file_list->filename : NULL);
+}
+
int getImageIDFromToken(char *token)
{
struct FileInfo *file_list = image_info->file_list;
return -1;
}
-char *getImageConfigFilename()
+char *getImageConfigFilename(void)
{
return getCustomArtworkConfigFilename(image_info->type);
}
-int getImageListPropertyMappingSize()
+int getImageListPropertyMappingSize(void)
{
return image_info->num_property_mapping_entries;
}
-struct PropertyMapping *getImageListPropertyMapping()
+struct PropertyMapping *getImageListPropertyMapping(void)
{
return image_info->property_mapping;
}
image_info = checked_calloc(sizeof(struct ArtworkListInfo));
image_info->type = ARTWORK_TYPE_GRAPHICS;
- /* ---------- initialize file list and suffix lists ---------- */
+ // ---------- initialize file list and suffix lists ----------
image_info->num_file_list_entries = num_file_list_entries;
image_info->num_dynamic_file_list_entries = 0;
image_info->suffix_list = config_suffix_list;
- /* ---------- initialize base prefix and suffixes lists ---------- */
+ // ---------- initialize base prefix and suffixes lists ----------
image_info->num_base_prefixes = 0;
for (i = 0; base_prefixes[i] != NULL; i++)
image_info->property_mapping = NULL;
- /* ---------- initialize artwork reference and content lists ---------- */
+ // ---------- initialize artwork reference and content lists ----------
image_info->sizeof_artwork_list_entry = sizeof(ImageInfo *);
image_info->content_list = NULL;
- /* ---------- initialize artwork loading/freeing functions ---------- */
+ // ---------- initialize artwork loading/freeing functions ----------
image_info->load_artwork = Load_Image;
image_info->free_artwork = FreeImage;
}
-void ReloadCustomImages()
+void ReloadCustomImages(void)
{
print_timestamp_init("ReloadCustomImages");
setString(&img_info->leveldir, leveldir_current->identifier);
}
-static void CreateImageTexturesExt(int pos, boolean force)
+void CreateImageTextures(int pos)
{
ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
- if (img_info == NULL || (img_info->contains_textures && !force))
+ if (img_info == NULL || img_info->contains_textures)
return;
CreateBitmapTextures(img_info->bitmaps);
img_info->contains_textures = TRUE;
}
-void CreateImageTextures(int pos)
+static void FreeImageTextures(int pos)
{
- CreateImageTexturesExt(pos, FALSE);
+ ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+ if (img_info == NULL || !img_info->contains_textures)
+ return;
+
+ FreeBitmapTextures(img_info->bitmaps);
+
+ img_info->contains_textures = FALSE;
}
-void ReCreateImageTextures(int pos)
+void FreeAllImageTextures(void)
{
- CreateImageTexturesExt(pos, TRUE);
+ int num_images = getImageListSize();
+ int i;
+
+ for (i = 0; i < num_images; i++)
+ FreeImageTextures(i);
}
void ScaleImage(int pos, int zoom_factor)
img_info->scaled_up = TRUE;
}
-void FreeAllImages()
+void FreeAllImages(void)
{
FreeCustomArtworkLists(image_info);
}