X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=4c1d57d52a1191f1a44d679211a4fbfa1c06f6fa;hp=3753f1a8d519469fef2d625f11ca9d9f25d952a8;hb=8d46c5298f0fcce7bdb52f3835b2fbbdc403dfe0;hpb=f8f7840ddc57a2c31a3d6ab664b0e4e7e7ad69ce diff --git a/src/main.h b/src/main.h index 3753f1a8..4c1d57d5 100644 --- a/src/main.h +++ b/src/main.h @@ -40,6 +40,10 @@ #include "msdos.h" #endif /* MSDOS */ +#ifdef USE_SDL_LIBRARY +#include "sdl.h" +#endif + #ifdef DEBUG #define DEBUG_TIMING 0 #endif @@ -54,6 +58,7 @@ typedef unsigned char byte; #define WIN_XSIZE 672 #define WIN_YSIZE 560 +#define WIN_SDL_DEPTH 16 /* !!! change this !!! */ #ifndef MSDOS #define WIN_XPOS 0 #define WIN_YPOS 0 @@ -455,6 +460,7 @@ struct GameInfo struct GlobalInfo { + int dummy; }; extern Display *display; @@ -472,6 +478,14 @@ extern XpmAttributes xpm_att[]; extern Drawable drawto, drawto_field, backbuffer, fieldbuffer; extern Colormap cmap; +#ifdef USE_SDL_LIBRARY +extern SDL_Surface *sdl_window; +extern SDL_Surface *sdl_drawto, *sdl_drawto_field; +extern SDL_Surface *sdl_backbuffer, *sdl_fieldbuffer; +extern SDL_Surface *sdl_pix[]; +extern SDL_Surface *sdl_pix_masked[], *sdl_tile_masked[]; +#endif + extern int sound_pipe[2]; extern int sound_device; extern char *sound_device_name; @@ -1013,6 +1027,7 @@ extern char *element_info[]; #define EL_PEARL_BREAKING 521 #define EL_TRAP_ACTIVE 522 #define EL_SPRING_MOVING 523 +#define EL_SP_MURPHY_CLONE 524 /* "unreal" (and therefore not drawable) runtime elements */ #define EL_BLOCKED 600 @@ -1377,6 +1392,8 @@ extern char *element_info[]; #define GFX2_SP_TERMINAL (GFX_START_ROCKSSP + 11 * SP_PER_LINE + 8) #define GFX2_SP_TERMINAL_ACTIVE (GFX_START_ROCKSSP + 12 * SP_PER_LINE + 8) +#define GFX_SP_MURPHY_CLONE (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 3) + /* graphics from "RocksDC" */ #define GFX_BELT1_MIDDLE (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 0) #define GFX_BELT1_LEFT (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 0) @@ -1658,7 +1675,7 @@ extern char *element_info[]; #define TAPES_DIRECTORY "tapes" #define SCORES_DIRECTORY "scores" -#define PROGRAM_VERSION_STRING "1.3.5" +#define PROGRAM_VERSION_STRING "1.4.0 SDL" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING