projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5f13e5
)
fixed bug with non-element images from dynamic configuration being scaled
author
Holger Schemel
<info@artsoft.org>
Fri, 29 Jul 2016 17:16:50 +0000
(19:16 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 29 Jul 2016 17:16:50 +0000
(19:16 +0200)
src/init.c
patch
|
blob
|
history
diff --git
a/src/init.c
b/src/init.c
index ff6c5767eb1eb2beaee553729556268ae390ed3b..74ea88a03a9674cb7ad05e75920d1b4d7ac7d38c 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-195,22
+195,23
@@
void InitElementSmallImages()
print_timestamp_time("getImageListPropertyMapping/Size");
print_timestamp_init("InitElementSmallImagesScaledUp (1)");
print_timestamp_time("getImageListPropertyMapping/Size");
print_timestamp_init("InitElementSmallImagesScaledUp (1)");
- /* initialize normal images from static configuration */
+ /* initialize normal
element
images from static configuration */
for (i = 0; element_to_graphic[i].element > -1; i++)
InitElementSmallImagesScaledUp(element_to_graphic[i].graphic);
print_timestamp_done("InitElementSmallImagesScaledUp (1)");
for (i = 0; element_to_graphic[i].element > -1; i++)
InitElementSmallImagesScaledUp(element_to_graphic[i].graphic);
print_timestamp_done("InitElementSmallImagesScaledUp (1)");
- /* initialize special images from static configuration */
+ /* initialize special
element
images from static configuration */
for (i = 0; element_to_special_graphic[i].element > -1; i++)
InitElementSmallImagesScaledUp(element_to_special_graphic[i].graphic);
print_timestamp_time("InitElementSmallImagesScaledUp (2)");
for (i = 0; element_to_special_graphic[i].element > -1; i++)
InitElementSmallImagesScaledUp(element_to_special_graphic[i].graphic);
print_timestamp_time("InitElementSmallImagesScaledUp (2)");
- /* initialize
images from dynamic configuration (may be elements or other)
*/
+ /* initialize
element images from dynamic configuration
*/
for (i = 0; i < num_property_mappings; i++)
for (i = 0; i < num_property_mappings; i++)
- InitElementSmallImagesScaledUp(property_mapping[i].artwork_index);
+ if (property_mapping[i].base_index < MAX_NUM_ELEMENTS)
+ InitElementSmallImagesScaledUp(property_mapping[i].artwork_index);
print_timestamp_time("InitElementSmallImagesScaledUp (3)");
print_timestamp_time("InitElementSmallImagesScaledUp (3)");
- /* initialize special
images from above list (non-element images)
*/
+ /* initialize special
non-element images from above list
*/
for (i = 0; special_graphics[i] > -1; i++)
InitElementSmallImagesScaledUp(special_graphics[i]);
print_timestamp_time("InitElementSmallImagesScaledUp (4)");
for (i = 0; special_graphics[i] > -1; i++)
InitElementSmallImagesScaledUp(special_graphics[i]);
print_timestamp_time("InitElementSmallImagesScaledUp (4)");