From: Holger Schemel Date: Tue, 15 Mar 2022 23:52:49 +0000 (+0100) Subject: added support for background image for initial loading screen X-Git-Tag: 4.3.2.0~73 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=27fd44d4a7662658efd3c01f4362070599f6b426;p=rocksndiamonds.git added support for background image for initial loading screen --- diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 3b39306a..8ba2e7f6 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -7343,6 +7343,7 @@ struct ConfigInfo image_config[] = { "global.tile_cursor.frames", "1" }, { "background", UNDEFINED_FILENAME }, + { "background.LOADING_INITIAL", UNDEFINED_FILENAME }, { "background.LOADING", UNDEFINED_FILENAME }, { "background.TITLE_INITIAL", UNDEFINED_FILENAME }, { "background.TITLE", UNDEFINED_FILENAME }, diff --git a/src/init.c b/src/init.c index 041098f2..2e250179 100644 --- a/src/init.c +++ b/src/init.c @@ -35,12 +35,14 @@ #define CONFIG_TOKEN_FONT_INITIAL "font.initial" #define CONFIG_TOKEN_GLOBAL_BUSY "global.busy" +#define CONFIG_TOKEN_BACKGROUND_LOADING_INITIAL "background.LOADING_INITIAL" #define CONFIG_TOKEN_BACKGROUND_LOADING "background.LOADING" #define INITIAL_IMG_GLOBAL_BUSY 0 -#define INITIAL_IMG_BACKGROUND_LOADING 1 +#define INITIAL_IMG_BACKGROUND_LOADING_INITIAL 1 +#define INITIAL_IMG_BACKGROUND_LOADING 2 -#define NUM_INITIAL_IMAGES 2 +#define NUM_INITIAL_IMAGES 3 static struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS]; @@ -102,13 +104,16 @@ static int get_graphic_parameter_value(char *, char *, int); static void SetLoadingBackgroundImage(void) { struct GraphicInfo *graphic_info_last = graphic_info; + int background_image = (game_status_last_screen == -1 ? + INITIAL_IMG_BACKGROUND_LOADING_INITIAL : + INITIAL_IMG_BACKGROUND_LOADING); graphic_info = image_initial; SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_ALL); - SetWindowBackgroundImage(INITIAL_IMG_BACKGROUND_LOADING); + SetWindowBackgroundImage(background_image); graphic_info = graphic_info_last; } @@ -5567,6 +5572,7 @@ static void InitGfx(void) char *image_token[NUM_INITIAL_IMAGES] = { CONFIG_TOKEN_GLOBAL_BUSY, + CONFIG_TOKEN_BACKGROUND_LOADING_INITIAL, CONFIG_TOKEN_BACKGROUND_LOADING }; Bitmap *bitmap_font_initial = NULL;