X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=820d3c5bf6d8aa379fdd5b07a20ecaf2911e381c;hb=2d235297197dd0c325184f7fc401d9c5c41c2616;hp=1374311eb18518517a7491332606ebf76f16a814;hpb=86e1890b2d87dd7710b320e2b306c7291d41e2a5;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 1374311e..820d3c5b 100644 --- a/src/main.h +++ b/src/main.h @@ -1218,30 +1218,31 @@ #define GFX_ARG_2ND_OFFSET 12 #define GFX_ARG_2ND_XOFFSET 13 #define GFX_ARG_2ND_YOFFSET 14 -#define GFX_ARG_FRAMES 15 -#define GFX_ARG_FRAMES_PER_LINE 16 -#define GFX_ARG_START_FRAME 17 -#define GFX_ARG_DELAY 18 -#define GFX_ARG_ANIM_MODE 19 -#define GFX_ARG_GLOBAL_SYNC 20 -#define GFX_ARG_CRUMBLED_LIKE 21 -#define GFX_ARG_DIGGABLE_LIKE 22 -#define GFX_ARG_BORDER_SIZE 23 -#define GFX_ARG_STEP_OFFSET 24 -#define GFX_ARG_STEP_DELAY 25 -#define GFX_ARG_DIRECTION 26 -#define GFX_ARG_POSITION 27 -#define GFX_ARG_DRAW_XOFFSET 28 -#define GFX_ARG_DRAW_YOFFSET 29 -#define GFX_ARG_DRAW_MASKED 30 -#define GFX_ARG_ANIM_DELAY_FIXED 31 -#define GFX_ARG_ANIM_DELAY_RANDOM 32 -#define GFX_ARG_POST_DELAY_FIXED 33 -#define GFX_ARG_POST_DELAY_RANDOM 34 -#define GFX_ARG_NAME 35 -#define GFX_ARG_SCALE_UP_FACTOR 36 - -#define NUM_GFX_ARGS 37 +#define GFX_ARG_2ND_SWAP_TILES 15 +#define GFX_ARG_FRAMES 16 +#define GFX_ARG_FRAMES_PER_LINE 17 +#define GFX_ARG_START_FRAME 18 +#define GFX_ARG_DELAY 19 +#define GFX_ARG_ANIM_MODE 20 +#define GFX_ARG_GLOBAL_SYNC 21 +#define GFX_ARG_CRUMBLED_LIKE 22 +#define GFX_ARG_DIGGABLE_LIKE 23 +#define GFX_ARG_BORDER_SIZE 24 +#define GFX_ARG_STEP_OFFSET 25 +#define GFX_ARG_STEP_DELAY 26 +#define GFX_ARG_DIRECTION 27 +#define GFX_ARG_POSITION 28 +#define GFX_ARG_DRAW_XOFFSET 29 +#define GFX_ARG_DRAW_YOFFSET 30 +#define GFX_ARG_DRAW_MASKED 31 +#define GFX_ARG_ANIM_DELAY_FIXED 32 +#define GFX_ARG_ANIM_DELAY_RANDOM 33 +#define GFX_ARG_POST_DELAY_FIXED 34 +#define GFX_ARG_POST_DELAY_RANDOM 35 +#define GFX_ARG_NAME 36 +#define GFX_ARG_SCALE_UP_FACTOR 37 + +#define NUM_GFX_ARGS 38 /* values for sound configuration suffixes */ @@ -1325,9 +1326,9 @@ /* program information and versioning definitions */ #define PROGRAM_VERSION_MAJOR 3 -#define PROGRAM_VERSION_MINOR 1 -#define PROGRAM_VERSION_PATCH 1 -#define PROGRAM_VERSION_BUILD 0 +#define PROGRAM_VERSION_MINOR 2 +#define PROGRAM_VERSION_PATCH 0 +#define PROGRAM_VERSION_BUILD 1 #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" @@ -1906,6 +1907,7 @@ struct GraphicInfo int offset_x, offset_y; /* x/y offset to next animation frame */ int offset2_x, offset2_y; /* x/y offset to second movement tile */ boolean double_movement; /* animation has second movement tile */ + int swap_double_tiles; /* explicitely force or forbid tile swapping */ int anim_frames; int anim_frames_per_line; int anim_start_frame;