X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=34f8bcbf72ba2470331274e0ed08e48ad836cc80;hb=90bf2712051fd9dd255f3269891daec81f746566;hp=56ecbd16a67dbeabac69dadc4ffd331e1411cd83;hpb=d442dd6ca65b694c37fbd3c93505644fe8478263;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 56ecbd16..34f8bcbf 100644 --- a/src/main.h +++ b/src/main.h @@ -31,6 +31,8 @@ #include "conf_mus.h" /* include auto-generated data structure definitions */ +#define NEW_SCROLL 0 + #define IMG_UNDEFINED (-1) #define IMG_EMPTY IMG_EMPTY_SPACE #define IMG_SP_EMPTY IMG_EMPTY_SPACE @@ -43,13 +45,17 @@ #define SND_UNDEFINED (-1) #define MUS_UNDEFINED (-1) +#if 0 #define WIN_XSIZE 672 #define WIN_YSIZE 560 +#endif #define DEFAULT_FULLSCREEN_MODE "800x600" +#if 0 #define SCR_FIELDX 17 #define SCR_FIELDY 17 +#endif #define MAX_BUF_XSIZE (SCR_FIELDX + 2) #define MAX_BUF_YSIZE (SCR_FIELDY + 2) #define MIN_LEV_FIELDX 3 @@ -943,6 +949,7 @@ #define MAX_INITIAL_INVENTORY_SIZE 8 /* often used screen positions */ +#if 0 #define SX 8 #define SY 8 #define REAL_SX (SX - 2) @@ -953,6 +960,7 @@ #define VY 400 #define EX DX #define EY (VY - 44) +#endif #define TILESIZE 32 #define TILEX TILESIZE #define TILEY TILESIZE @@ -1822,11 +1830,12 @@ #define GFX_SPECIAL_ARG_SETUP 9 #define GFX_SPECIAL_ARG_PLAYING 10 #define GFX_SPECIAL_ARG_DOOR 11 -#define GFX_SPECIAL_ARG_PANEL 12 -#define GFX_SPECIAL_ARG_PREVIEW 13 -#define GFX_SPECIAL_ARG_CRUMBLED 14 +#define GFX_SPECIAL_ARG_TAPE 12 +#define GFX_SPECIAL_ARG_PANEL 13 +#define GFX_SPECIAL_ARG_PREVIEW 14 +#define GFX_SPECIAL_ARG_CRUMBLED 15 -#define NUM_SPECIAL_GFX_ARGS 15 +#define NUM_SPECIAL_GFX_ARGS 16 /* these additional definitions are currently only used for draw offsets */ #define GFX_SPECIAL_ARG_INFO_MAIN 0 @@ -1852,10 +1861,11 @@ #define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1 8 #define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2 9 #define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3 10 -#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK 11 -#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER 12 +#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4 11 +#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK 12 +#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER 13 -#define NUM_SPECIAL_GFX_SETUP_ARGS 13 +#define NUM_SPECIAL_GFX_SETUP_ARGS 14 /* values for image configuration suffixes */ @@ -1905,8 +1915,14 @@ #define GFX_ARG_ALIGN 43 #define GFX_ARG_VALIGN 44 #define GFX_ARG_SORT_PRIORITY 45 +#define GFX_ARG_CLASS 46 +#define GFX_ARG_STYLE 47 +#define GFX_ARG_ACTIVE_XOFFSET 48 +#define GFX_ARG_ACTIVE_YOFFSET 49 +#define GFX_ARG_PRESSED_XOFFSET 50 +#define GFX_ARG_PRESSED_YOFFSET 51 -#define NUM_GFX_ARGS 46 +#define NUM_GFX_ARGS 52 /* values for sound configuration suffixes */ @@ -1992,13 +2008,14 @@ #define GAME_MODE_SETUP 9 #define GAME_MODE_PLAYING 10 #define GAME_MODE_PSEUDO_DOOR 11 -#define GAME_MODE_PSEUDO_PANEL 12 -#define GAME_MODE_PSEUDO_PREVIEW 13 -#define GAME_MODE_PSEUDO_CRUMBLED 14 +#define GAME_MODE_PSEUDO_TAPE 12 +#define GAME_MODE_PSEUDO_PANEL 13 +#define GAME_MODE_PSEUDO_PREVIEW 14 +#define GAME_MODE_PSEUDO_CRUMBLED 15 /* there are no special config file suffixes for these modes */ -#define GAME_MODE_PSEUDO_TYPENAME 15 -#define GAME_MODE_QUIT 16 +#define GAME_MODE_PSEUDO_TYPENAME 16 +#define GAME_MODE_QUIT 17 /* special definitions currently only used for custom artwork configuration */ #define MUSIC_PREFIX_BACKGROUND 0 @@ -2012,13 +2029,13 @@ /* program information and versioning definitions */ #define PROGRAM_VERSION_MAJOR 3 -#define PROGRAM_VERSION_MINOR 2 -#define PROGRAM_VERSION_PATCH 6 +#define PROGRAM_VERSION_MINOR 3 +#define PROGRAM_VERSION_PATCH 0 #define PROGRAM_VERSION_BUILD 2 #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" -#define PROGRAM_COPYRIGHT_STRING "Copyright ©1995-2009 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "Copyright ©1995-2010 by Holger Schemel" #define PROGRAM_EMAIL_STRING "info@artsoft.org" #define PROGRAM_WEBSITE_STRING "http://www.artsoft.org/" #define PROGRAM_GAME_BY_STRING "A Game by Artsoft Entertainment" @@ -2248,6 +2265,14 @@ struct PreviewInfo int anim_mode; }; +struct ViewportInfo +{ + struct RectWithBorder window; + struct RectWithBorder playfield[NUM_SPECIAL_GFX_ARGS]; + struct RectWithBorder door_1[NUM_SPECIAL_GFX_ARGS]; + struct RectWithBorder door_2[NUM_SPECIAL_GFX_ARGS]; +}; + struct HiScore { char Name[MAX_PLAYER_NAME_LEN + 1]; @@ -2443,6 +2468,8 @@ struct GlobalInfo int fading_status; int fading_type; #endif + + boolean use_envelope_request; }; struct ElementChangeInfo @@ -2696,6 +2723,14 @@ struct GraphicInfo int align, valign; /* optional setting for drawing title screens */ int sort_priority; /* optional setting for drawing title screens */ + int class; + int style; + + int active_xoffset; + int active_yoffset; + int pressed_xoffset; + int pressed_yoffset; + boolean use_image_size; /* use image size as default width and height */ #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) @@ -2772,6 +2807,7 @@ struct HelpAnimInfo }; +extern Bitmap *bitmap_db_store; extern Bitmap *bitmap_db_cross; extern Bitmap *bitmap_db_field; extern Bitmap *bitmap_db_panel; @@ -2792,7 +2828,15 @@ extern SDL_Thread *server_thread; extern int key_joystick_mapping; +#if 1 +#if NEW_SCROLL +extern boolean redraw[2 + MAX_LEV_FIELDX + 2][2 + MAX_LEV_FIELDY + 2]; +#else +extern boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2]; +#endif +#else extern boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; +#endif extern int redraw_x1, redraw_y1; extern short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; @@ -2837,6 +2881,15 @@ extern int ActiveFont[NUM_FONTS]; extern int lev_fieldx, lev_fieldy; extern int scroll_x, scroll_y; +extern int WIN_XSIZE, WIN_YSIZE; +extern int SCR_FIELDX, SCR_FIELDY; +extern int SX, SY; +extern int REAL_SX, REAL_SY; +extern int DX, DY; +extern int VX, VY; +extern int EX, EY; +extern int dDX, dDY; + extern int FX, FY; extern int ScrollStepSize; extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos; @@ -2863,6 +2916,7 @@ extern struct HiScore highscore[]; extern struct TapeInfo tape; extern struct GlobalInfo global; extern struct BorderInfo border; +extern struct ViewportInfo viewport; extern struct TitleFadingInfo fading; extern struct TitleFadingInfo fading_none; extern struct TitleFadingInfo title_initial_default; @@ -2872,7 +2926,7 @@ extern struct TitleMessageInfo titlemessage_initial[]; extern struct TitleMessageInfo titlemessage_default; extern struct TitleMessageInfo titlemessage[]; extern struct TitleMessageInfo readme; -extern struct InitInfo init; +extern struct InitInfo init, init_last; extern struct MenuInfo menu; extern struct DoorInfo door_1, door_2; extern struct PreviewInfo preview;