From: Holger Schemel Date: Tue, 2 Feb 2016 21:05:26 +0000 (+0100) Subject: added another configuration option for global animation properties X-Git-Tag: 4.0.0.0-rc1~91 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=daabb36abdc5b6cad050f60e576a1dd758854171;p=rocksndiamonds.git added another configuration option for global animation properties --- diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 860f53d4..e5937a08 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -47,6 +47,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".step_offset", "4", TYPE_INTEGER }, { ".step_xoffset", ARG_UNDEFINED, TYPE_INTEGER }, { ".step_yoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".step_frames", ARG_UNDEFINED, TYPE_INTEGER }, { ".step_delay", "1", TYPE_INTEGER }, { ".direction", ARG_UNDEFINED, TYPE_STRING }, { ".position", ARG_UNDEFINED, TYPE_STRING }, diff --git a/src/init.c b/src/init.c index 6a48f576..0af298ee 100644 --- a/src/init.c +++ b/src/init.c @@ -1338,6 +1338,7 @@ static void set_graphic_parameters_ext(int graphic, int *parameter, g->step_offset = parameter[GFX_ARG_STEP_OFFSET]; g->step_xoffset = parameter[GFX_ARG_STEP_XOFFSET]; g->step_yoffset = parameter[GFX_ARG_STEP_YOFFSET]; + g->step_frames = parameter[GFX_ARG_STEP_FRAMES]; g->step_delay = parameter[GFX_ARG_STEP_DELAY]; g->direction = parameter[GFX_ARG_DIRECTION]; g->position = parameter[GFX_ARG_POSITION]; diff --git a/src/main.h b/src/main.h index fd07d4e2..157eafe6 100644 --- a/src/main.h +++ b/src/main.h @@ -1866,35 +1866,36 @@ #define GFX_ARG_STEP_OFFSET 25 #define GFX_ARG_STEP_XOFFSET 26 #define GFX_ARG_STEP_YOFFSET 27 -#define GFX_ARG_STEP_DELAY 28 -#define GFX_ARG_DIRECTION 29 -#define GFX_ARG_POSITION 30 -#define GFX_ARG_DRAW_XOFFSET 31 -#define GFX_ARG_DRAW_YOFFSET 32 -#define GFX_ARG_DRAW_MASKED 33 -#define GFX_ARG_ANIM_DELAY_FIXED 34 -#define GFX_ARG_ANIM_DELAY_RANDOM 35 -#define GFX_ARG_POST_DELAY_FIXED 36 -#define GFX_ARG_POST_DELAY_RANDOM 37 -#define GFX_ARG_NAME 38 -#define GFX_ARG_SCALE_UP_FACTOR 39 -#define GFX_ARG_TILE_SIZE 40 -#define GFX_ARG_CLONE_FROM 41 -#define GFX_ARG_FADE_MODE 42 -#define GFX_ARG_FADE_DELAY 43 -#define GFX_ARG_POST_DELAY 44 -#define GFX_ARG_AUTO_DELAY 45 -#define GFX_ARG_ALIGN 46 -#define GFX_ARG_VALIGN 47 -#define GFX_ARG_SORT_PRIORITY 48 -#define GFX_ARG_CLASS 49 -#define GFX_ARG_STYLE 50 -#define GFX_ARG_ACTIVE_XOFFSET 51 -#define GFX_ARG_ACTIVE_YOFFSET 52 -#define GFX_ARG_PRESSED_XOFFSET 53 -#define GFX_ARG_PRESSED_YOFFSET 54 - -#define NUM_GFX_ARGS 55 +#define GFX_ARG_STEP_FRAMES 28 +#define GFX_ARG_STEP_DELAY 29 +#define GFX_ARG_DIRECTION 30 +#define GFX_ARG_POSITION 31 +#define GFX_ARG_DRAW_XOFFSET 32 +#define GFX_ARG_DRAW_YOFFSET 33 +#define GFX_ARG_DRAW_MASKED 34 +#define GFX_ARG_ANIM_DELAY_FIXED 35 +#define GFX_ARG_ANIM_DELAY_RANDOM 36 +#define GFX_ARG_POST_DELAY_FIXED 37 +#define GFX_ARG_POST_DELAY_RANDOM 38 +#define GFX_ARG_NAME 39 +#define GFX_ARG_SCALE_UP_FACTOR 40 +#define GFX_ARG_TILE_SIZE 41 +#define GFX_ARG_CLONE_FROM 42 +#define GFX_ARG_FADE_MODE 43 +#define GFX_ARG_FADE_DELAY 44 +#define GFX_ARG_POST_DELAY 45 +#define GFX_ARG_AUTO_DELAY 46 +#define GFX_ARG_ALIGN 47 +#define GFX_ARG_VALIGN 48 +#define GFX_ARG_SORT_PRIORITY 49 +#define GFX_ARG_CLASS 50 +#define GFX_ARG_STYLE 51 +#define GFX_ARG_ACTIVE_XOFFSET 52 +#define GFX_ARG_ACTIVE_YOFFSET 53 +#define GFX_ARG_PRESSED_XOFFSET 54 +#define GFX_ARG_PRESSED_YOFFSET 55 + +#define NUM_GFX_ARGS 56 /* values for sound configuration suffixes */ @@ -2808,6 +2809,7 @@ struct GraphicInfo int step_offset; /* optional step offset of toon animations */ int step_xoffset; /* optional step offset of toon animations */ int step_yoffset; /* optional step offset of toon animations */ + int step_frames; /* optional step frames of toon animations */ int step_delay; /* optional step delay of toon animations */ int direction; /* optional move direction of toon animations */ int position; /* optional draw position of toon animations */