From: Holger Schemel Date: Wed, 10 Feb 2016 20:00:02 +0000 (+0100) Subject: added another configuration option for global animation properties X-Git-Tag: 4.0.0.0-rc1~74 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=3d7e2dc14fb5478cb7590eb9808ccafbe48ae096;p=rocksndiamonds.git added another configuration option for global animation properties --- diff --git a/src/conf_gfx.c b/src/conf_gfx.c index e85df278..ed2d85eb 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -54,6 +54,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".draw_xoffset", "0", TYPE_INTEGER }, { ".draw_yoffset", "0", TYPE_INTEGER }, { ".draw_masked", "false", TYPE_BOOLEAN }, + { ".draw_order", ARG_UNDEFINED, TYPE_INTEGER }, { ".init_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, { ".init_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".anim_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, diff --git a/src/init.c b/src/init.c index 96eefb31..bda77b8b 100644 --- a/src/init.c +++ b/src/init.c @@ -1366,6 +1366,9 @@ static void set_graphic_parameters_ext(int graphic, int *parameter, /* this is only used for drawing envelope graphics */ g->draw_masked = parameter[GFX_ARG_DRAW_MASKED]; + /* used for toon animations and global animations */ + g->draw_order = parameter[GFX_ARG_DRAW_ORDER]; + /* optional graphic for cloning all graphics settings */ if (parameter[GFX_ARG_CLONE_FROM] != ARG_UNDEFINED_VALUE) g->clone_from = parameter[GFX_ARG_CLONE_FROM]; diff --git a/src/main.h b/src/main.h index dc1ed998..9cf276a2 100644 --- a/src/main.h +++ b/src/main.h @@ -1875,31 +1875,32 @@ #define GFX_ARG_DRAW_XOFFSET 32 #define GFX_ARG_DRAW_YOFFSET 33 #define GFX_ARG_DRAW_MASKED 34 -#define GFX_ARG_INIT_DELAY_FIXED 35 -#define GFX_ARG_INIT_DELAY_RANDOM 36 -#define GFX_ARG_ANIM_DELAY_FIXED 37 -#define GFX_ARG_ANIM_DELAY_RANDOM 38 -#define GFX_ARG_POST_DELAY_FIXED 39 -#define GFX_ARG_POST_DELAY_RANDOM 40 -#define GFX_ARG_NAME 41 -#define GFX_ARG_SCALE_UP_FACTOR 42 -#define GFX_ARG_TILE_SIZE 43 -#define GFX_ARG_CLONE_FROM 44 -#define GFX_ARG_FADE_MODE 45 -#define GFX_ARG_FADE_DELAY 46 -#define GFX_ARG_POST_DELAY 47 -#define GFX_ARG_AUTO_DELAY 48 -#define GFX_ARG_ALIGN 49 -#define GFX_ARG_VALIGN 50 -#define GFX_ARG_SORT_PRIORITY 51 -#define GFX_ARG_CLASS 52 -#define GFX_ARG_STYLE 53 -#define GFX_ARG_ACTIVE_XOFFSET 54 -#define GFX_ARG_ACTIVE_YOFFSET 55 -#define GFX_ARG_PRESSED_XOFFSET 56 -#define GFX_ARG_PRESSED_YOFFSET 57 - -#define NUM_GFX_ARGS 58 +#define GFX_ARG_DRAW_ORDER 35 +#define GFX_ARG_INIT_DELAY_FIXED 36 +#define GFX_ARG_INIT_DELAY_RANDOM 37 +#define GFX_ARG_ANIM_DELAY_FIXED 38 +#define GFX_ARG_ANIM_DELAY_RANDOM 39 +#define GFX_ARG_POST_DELAY_FIXED 40 +#define GFX_ARG_POST_DELAY_RANDOM 41 +#define GFX_ARG_NAME 42 +#define GFX_ARG_SCALE_UP_FACTOR 43 +#define GFX_ARG_TILE_SIZE 44 +#define GFX_ARG_CLONE_FROM 45 +#define GFX_ARG_FADE_MODE 46 +#define GFX_ARG_FADE_DELAY 47 +#define GFX_ARG_POST_DELAY 48 +#define GFX_ARG_AUTO_DELAY 49 +#define GFX_ARG_ALIGN 50 +#define GFX_ARG_VALIGN 51 +#define GFX_ARG_SORT_PRIORITY 52 +#define GFX_ARG_CLASS 53 +#define GFX_ARG_STYLE 54 +#define GFX_ARG_ACTIVE_XOFFSET 55 +#define GFX_ARG_ACTIVE_YOFFSET 56 +#define GFX_ARG_PRESSED_XOFFSET 57 +#define GFX_ARG_PRESSED_YOFFSET 58 + +#define NUM_GFX_ARGS 59 /* values for sound configuration suffixes */ @@ -2840,6 +2841,7 @@ struct GraphicInfo int draw_yoffset; /* optional offset for drawing font chars */ int draw_masked; /* optional setting for drawing envelope gfx */ + int draw_order; /* optional draw order for global animations */ int fade_mode; /* optional setting for drawing title screens */ int fade_delay; /* optional setting for drawing title screens */