X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=2da455841722274ed5917a087faff9a539f173ce;hp=3cc923c2866f2442e08ce870b5f7f5fc3bbadf0e;hb=33cabd20cdb4e7aa84dfd30975f1364e7b776121;hpb=013e137cafaa16827d0f27e10538b6e90ee0aed0 diff --git a/src/main.h b/src/main.h index 3cc923c2..2da45584 100644 --- a/src/main.h +++ b/src/main.h @@ -2051,7 +2051,7 @@ #define PROGRAM_VERSION_MINOR 0 #define PROGRAM_VERSION_PATCH 0 #define PROGRAM_VERSION_BUILD 0 -#define PROGRAM_VERSION_EXTRA " RC1" +#define PROGRAM_VERSION_EXTRA " RC2" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" @@ -2825,8 +2825,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 @@ -2972,12 +2973,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; @@ -3082,19 +3083,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;