X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=2f1a103978513d915de232626c1a9ec3a47295de;hp=3cc923c2866f2442e08ce870b5f7f5fc3bbadf0e;hb=f1dae0af49fa331f6fedc6cbdf59eed0909ae391;hpb=013e137cafaa16827d0f27e10538b6e90ee0aed0 diff --git a/src/main.h b/src/main.h index 3cc923c2..2f1a1039 100644 --- a/src/main.h +++ b/src/main.h @@ -1896,25 +1896,27 @@ #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_INIT_EVENT 41 +#define GFX_ARG_ANIM_EVENT 42 +#define GFX_ARG_NAME 43 +#define GFX_ARG_SCALE_UP_FACTOR 44 +#define GFX_ARG_TILE_SIZE 45 +#define GFX_ARG_CLONE_FROM 46 +#define GFX_ARG_FADE_MODE 47 +#define GFX_ARG_FADE_DELAY 48 +#define GFX_ARG_POST_DELAY 49 +#define GFX_ARG_AUTO_DELAY 50 +#define GFX_ARG_ALIGN 51 +#define GFX_ARG_VALIGN 52 +#define GFX_ARG_SORT_PRIORITY 53 +#define GFX_ARG_CLASS 54 +#define GFX_ARG_STYLE 55 +#define GFX_ARG_ACTIVE_XOFFSET 56 +#define GFX_ARG_ACTIVE_YOFFSET 57 +#define GFX_ARG_PRESSED_XOFFSET 58 +#define GFX_ARG_PRESSED_YOFFSET 59 + +#define NUM_GFX_ARGS 60 /* values for sound configuration suffixes */ @@ -2050,14 +2052,14 @@ #define PROGRAM_VERSION_MAJOR 4 #define PROGRAM_VERSION_MINOR 0 #define PROGRAM_VERSION_PATCH 0 -#define PROGRAM_VERSION_BUILD 0 -#define PROGRAM_VERSION_EXTRA " RC1" +#define PROGRAM_VERSION_BUILD 2 +#define PROGRAM_VERSION_EXTRA "" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define PROGRAM_EMAIL_STRING "info@artsoft.org" #define PROGRAM_WEBSITE_STRING "http://www.artsoft.org/" -#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2016 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2017 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_ICON_FILENAME "RocksIcon32x32.png" @@ -2122,9 +2124,19 @@ #define NUM_ENGINE_TYPES 4 /* values for automatically playing tapes */ -#define AUTOPLAY_TEST 0 -#define AUTOPLAY_PLAY 1 -#define AUTOPLAY_FFWD 2 +#define AUTOPLAY_NONE 0 +#define AUTOPLAY_PLAY (1 << 0) +#define AUTOPLAY_FFWD (1 << 1) +#define AUTOPLAY_WARP (1 << 2) +#define AUTOPLAY_TEST (1 << 3) +#define AUTOPLAY_WARP_NO_DISPLAY AUTOPLAY_TEST + +#define AUTOPLAY_MODE_NONE 0 +#define AUTOPLAY_MODE_PLAY (AUTOPLAY_MODE_NONE | AUTOPLAY_PLAY) +#define AUTOPLAY_MODE_FFWD (AUTOPLAY_MODE_PLAY | AUTOPLAY_FFWD) +#define AUTOPLAY_MODE_WARP (AUTOPLAY_MODE_FFWD | AUTOPLAY_WARP) +#define AUTOPLAY_MODE_TEST (AUTOPLAY_MODE_WARP | AUTOPLAY_TEST) +#define AUTOPLAY_MODE_WARP_NO_DISPLAY AUTOPLAY_MODE_TEST struct BorderInfo @@ -2339,40 +2351,44 @@ struct EditorGadgetInfo struct EditorButtonInfo { - struct XY prev_level; - struct XY next_level; - - struct XY properties; - - struct XY draw_single; - struct XY draw_connected; - struct XY draw_line; - struct XY draw_arc; - struct XY draw_rectangle; - struct XY draw_filled_box; - struct XY rotate_up; - struct XY draw_text; - struct XY flood_fill; - struct XY rotate_left; - struct XY zoom_level; - struct XY rotate_right; - struct XY draw_random; - struct XY grab_brush; - struct XY rotate_down; - struct XY pick_element; - - struct XY ce_copy_from; - struct XY ce_copy_to; - struct XY ce_swap; - struct XY ce_copy; - struct XY ce_paste; - - struct XY undo; - struct XY conf; - struct XY save; - struct XY clear; - struct XY test; - struct XY exit; + struct XYTileSize prev_level; + struct XYTileSize next_level; + + struct XYTileSize properties; + struct XYTileSize element_left; + struct XYTileSize element_middle; + struct XYTileSize element_right; + struct XYTileSize palette; + + struct XYTileSize draw_single; + struct XYTileSize draw_connected; + struct XYTileSize draw_line; + struct XYTileSize draw_arc; + struct XYTileSize draw_rectangle; + struct XYTileSize draw_filled_box; + struct XYTileSize rotate_up; + struct XYTileSize draw_text; + struct XYTileSize flood_fill; + struct XYTileSize rotate_left; + struct XYTileSize zoom_level; + struct XYTileSize rotate_right; + struct XYTileSize draw_random; + struct XYTileSize grab_brush; + struct XYTileSize rotate_down; + struct XYTileSize pick_element; + + struct XYTileSize ce_copy_from; + struct XYTileSize ce_copy_to; + struct XYTileSize ce_swap; + struct XYTileSize ce_copy; + struct XYTileSize ce_paste; + + struct XYTileSize undo; + struct XYTileSize conf; + struct XYTileSize save; + struct XYTileSize clear; + struct XYTileSize test; + struct XYTileSize exit; }; struct EditorInputInfo @@ -2380,21 +2396,17 @@ struct EditorInputInfo struct XY level_number; }; -struct EditorPaletteElementInfo -{ - int x, y; - int tile_size; -}; - struct EditorPaletteInfo { int x, y; int cols, rows; int tile_size; + boolean show_as_separate_screen; + boolean show_on_element_buttons; - struct EditorPaletteElementInfo element_left; - struct EditorPaletteElementInfo element_middle; - struct EditorPaletteElementInfo element_right; + struct XYTileSize element_left; + struct XYTileSize element_middle; + struct XYTileSize element_right; }; struct EditorDrawingAreaInfo @@ -2586,6 +2598,7 @@ struct LevelInfo boolean use_custom_template; /* use custom properties from template file */ boolean no_valid_file; /* set when level file missing or invalid */ + boolean no_level_file; /* set when falling back to level template */ boolean changed; /* set when level was changed in the editor */ @@ -2825,8 +2838,9 @@ struct GlobalAnimInfo /* global animation graphic and control definitions */ int graphic[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS]; - /* global animation sound definitions */ + /* global animation sound and music definitions */ int sound[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS]; + int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS]; }; struct GraphicInfo @@ -2871,6 +2885,9 @@ struct GraphicInfo int post_delay_fixed; /* optional delay values after bored/global */ int post_delay_random; /* animations (pause before next animation) */ + int init_event; /* optional event triggering animation start */ + int anim_event; /* optional event triggering animation end */ + 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 */ @@ -2972,12 +2989,12 @@ struct HelpAnimInfo }; -extern Bitmap *bitmap_db_store; -extern Bitmap *bitmap_db_cross; extern Bitmap *bitmap_db_field; extern Bitmap *bitmap_db_panel; extern Bitmap *bitmap_db_door_1; extern Bitmap *bitmap_db_door_2; +extern Bitmap *bitmap_db_store_1; +extern Bitmap *bitmap_db_store_2; extern DrawBuffer *fieldbuffer; extern DrawBuffer *drawto_field; @@ -3057,6 +3074,7 @@ extern int FX, FY; extern int ScrollStepSize; extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos; extern int BorderElement; +extern int MenuFrameDelay; extern int GameFrameDelay; extern int FfwdFrameDelay; extern int BX1, BY1; @@ -3082,19 +3100,25 @@ extern struct BorderInfo border; extern struct ViewportInfo viewport; extern struct TitleFadingInfo fading; extern struct TitleFadingInfo fading_none; +extern struct TitleFadingInfo title_initial_first_default; extern struct TitleFadingInfo title_initial_default; +extern struct TitleFadingInfo title_first_default; extern struct TitleFadingInfo title_default; -extern struct TitleMessageInfo titlescreen_initial_default; +extern struct TitleMessageInfo titlescreen_initial_first_default; extern struct TitleMessageInfo titlescreen_initial_first[]; +extern struct TitleMessageInfo titlescreen_initial_default; extern struct TitleMessageInfo titlescreen_initial[]; -extern struct TitleMessageInfo titlescreen_default; +extern struct TitleMessageInfo titlescreen_first_default; extern struct TitleMessageInfo titlescreen_first[]; +extern struct TitleMessageInfo titlescreen_default; extern struct TitleMessageInfo titlescreen[]; -extern struct TitleMessageInfo titlemessage_initial_default; +extern struct TitleMessageInfo titlemessage_initial_first_default; extern struct TitleMessageInfo titlemessage_initial_first[]; +extern struct TitleMessageInfo titlemessage_initial_default; extern struct TitleMessageInfo titlemessage_initial[]; -extern struct TitleMessageInfo titlemessage_default; +extern struct TitleMessageInfo titlemessage_first_default; extern struct TitleMessageInfo titlemessage_first[]; +extern struct TitleMessageInfo titlemessage_default; extern struct TitleMessageInfo titlemessage[]; extern struct TitleMessageInfo readme; extern struct InitInfo init, init_last;