projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed drawing preferred network player in setup menu
[rocksndiamonds.git]
/
src
/
libgame
/
image.c
diff --git
a/src/libgame/image.c
b/src/libgame/image.c
index 76d9b183b730b1ef85511a101d869038b18aa8c9..3d959cba8a858407eb759dd8c1a1a7c283071b41 100644
(file)
--- a/
src/libgame/image.c
+++ b/
src/libgame/image.c
@@
-86,7
+86,7
@@
static void FreeImage(void *ptr)
free(image);
}
free(image);
}
-int getImageListSize()
+int getImageListSize(
void
)
{
return (image_info->num_file_list_entries +
image_info->num_dynamic_file_list_entries);
{
return (image_info->num_file_list_entries +
image_info->num_dynamic_file_list_entries);
@@
-140,6
+140,13
@@
char *getTokenFromImageID(int graphic)
return (file_list != NULL ? file_list->token : NULL);
}
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;
int getImageIDFromToken(char *token)
{
struct FileInfo *file_list = image_info->file_list;
@@
-153,17
+160,17
@@
int getImageIDFromToken(char *token)
return -1;
}
return -1;
}
-char *getImageConfigFilename()
+char *getImageConfigFilename(
void
)
{
return getCustomArtworkConfigFilename(image_info->type);
}
{
return getCustomArtworkConfigFilename(image_info->type);
}
-int getImageListPropertyMappingSize()
+int getImageListPropertyMappingSize(
void
)
{
return image_info->num_property_mapping_entries;
}
{
return image_info->num_property_mapping_entries;
}
-struct PropertyMapping *getImageListPropertyMapping()
+struct PropertyMapping *getImageListPropertyMapping(
void
)
{
return image_info->property_mapping;
}
{
return image_info->property_mapping;
}
@@
-243,7
+250,7
@@
void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
image_info->free_artwork = FreeImage;
}
image_info->free_artwork = FreeImage;
}
-void ReloadCustomImages()
+void ReloadCustomImages(
void
)
{
print_timestamp_init("ReloadCustomImages");
{
print_timestamp_init("ReloadCustomImages");
@@
-363,7
+370,7
@@
void CreateImageTextures(int pos)
img_info->contains_textures = TRUE;
}
img_info->contains_textures = TRUE;
}
-void FreeImageTextures(int pos)
+
static
void FreeImageTextures(int pos)
{
ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
{
ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
@@
-375,7
+382,7
@@
void FreeImageTextures(int pos)
img_info->contains_textures = FALSE;
}
img_info->contains_textures = FALSE;
}
-void FreeAllImageTextures()
+void FreeAllImageTextures(
void
)
{
int num_images = getImageListSize();
int i;
{
int num_images = getImageListSize();
int i;
@@
-397,7
+404,7
@@
void ScaleImage(int pos, int zoom_factor)
img_info->scaled_up = TRUE;
}
img_info->scaled_up = TRUE;
}
-void FreeAllImages()
+void FreeAllImages(
void
)
{
FreeCustomArtworkLists(image_info);
}
{
FreeCustomArtworkLists(image_info);
}