projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug that causes a crash with faulty GIC image size definitions
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index ccdda8e8043d6b5afd341a0cda065c9b877e49db..28dcd41ca2bc0036868afab182fae9d1f6ac1a0d 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1344,13
+1344,13
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
if (parameter[GFX_ARG_TILE_SIZE] != ARG_UNDEFINED_VALUE)
{
if (parameter[GFX_ARG_TILE_SIZE] != ARG_UNDEFINED_VALUE)
{
- anim_frames_per_row =
src_image_width / g->tile_size
;
- anim_frames_per_col =
src_image_height / g->tile_size
;
+ anim_frames_per_row =
MAX(1, src_image_width / g->tile_size)
;
+ anim_frames_per_col =
MAX(1, src_image_height / g->tile_size)
;
}
else
{
}
else
{
- anim_frames_per_row =
src_image_width / g->width
;
- anim_frames_per_col =
src_image_height / g->height
;
+ anim_frames_per_row =
MAX(1, src_image_width / g->width)
;
+ anim_frames_per_col =
MAX(1, src_image_height / g->height)
;
}
g->src_image_width = src_image_width;
}
g->src_image_width = src_image_width;
@@
-5456,6
+5456,9
@@
static void InitImages()
ReinitializeGraphics();
print_timestamp_time("ReinitializeGraphics");
ReinitializeGraphics();
print_timestamp_time("ReinitializeGraphics");
+ LoadMenuDesignSettings_AfterGraphics();
+ print_timestamp_time("LoadMenuDesignSettings_AfterGraphics");
+
UPDATE_BUSY_STATE();
print_timestamp_done("InitImages");
UPDATE_BUSY_STATE();
print_timestamp_done("InitImages");