X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=6bd09aa3bf1adedb7ed6ba67b4f8e8162d439da8;hb=897c46a2720672a49ce6d0803b08eed23fd2dd90;hp=60c060826c31eda6844d69a4dd22dd03b11f6cc3;hpb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;p=rocksndiamonds.git diff --git a/src/libgame/image.c b/src/libgame/image.c index 60c06082..6bd09aa3 100644 --- a/src/libgame/image.c +++ b/src/libgame/image.c @@ -21,17 +21,17 @@ struct ImageInfo 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; @@ -186,7 +186,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, 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; @@ -202,7 +202,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, 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++) @@ -234,7 +234,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, 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 *); @@ -244,7 +244,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, 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; @@ -370,7 +370,7 @@ void CreateImageTextures(int pos) img_info->contains_textures = TRUE; } -void FreeImageTextures(int pos) +static void FreeImageTextures(int pos) { ImageInfo *img_info = getImageInfoEntryFromImageID(pos);