projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved changing level in main menu (regardless of cursor position)
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index ccdda8e8043d6b5afd341a0cda065c9b877e49db..29f4fd4b130744436de7c7fe4951de2c44035a79 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");
@@
-5888,6
+5891,8
@@
void OpenAll()
print_timestamp_time("[init setup/config stuff (1)]");
print_timestamp_time("[init setup/config stuff (1)]");
+ InitScoresInfo();
+
if (options.execute_command)
Execute_Command(options.execute_command);
if (options.execute_command)
Execute_Command(options.execute_command);
@@
-5923,7
+5928,7
@@
void OpenAll()
InitVideoDisplay();
InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
InitVideoDisplay();
InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
- Init
EventFilter(FilterEvents
);
+ Init
OverlayInfo(
);
print_timestamp_time("[init video stuff]");
print_timestamp_time("[init video stuff]");