X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=d80ca571f2c1a5173e0f6721af0f8cbb38e6d6c9;hb=33dadce98a8fe9edfacf51d4e33e7b608883f855;hp=2478a9d06ed30f8b67cd565a7d4c3612992eab22;hpb=61a2ef633881ce5e865c8747f6393700c870f675;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 2478a9d0..d80ca571 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 " RC2" +#define PROGRAM_VERSION_EXTRA " RC3" #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; @@ -3057,6 +3058,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;