X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=6c2330321391bc9b32614f7ed8b4391e9a87873d;hb=811097f2a67a8f8002672cb777619893b83ca106;hp=37fcb08bc6ca75734a5f16832f52554813a55bc7;hpb=14089dac2cbe56e563863e1e5adb8847944fd262;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 37fcb08b..6c233032 100644 --- a/src/main.h +++ b/src/main.h @@ -30,10 +30,11 @@ #include "conf_gfx.h" #include "conf_snd.h" +#define IMG_NONE (-1) #define IMG_EMPTY IMG_EMPTY_SPACE #define IMG_SP_EMPTY IMG_SP_EMPTY_SPACE #define IMG_CHAR_START IMG_CHAR_SPACE -#define IMG_CUSTOM_START IMG_CUSTOM_0 +#define IMG_CUSTOM_START IMG_CUSTOM_1 #define WIN_XSIZE 672 #define WIN_YSIZE 560 @@ -678,8 +679,8 @@ #define EL_UNUSED_359 359 #define EL_CUSTOM_START 360 -#define EL_CUSTOM_0 (EL_CUSTOM_START + 0) -#define EL_CUSTOM_31 (EL_CUSTOM_START + 127) +#define EL_CUSTOM_1 (EL_CUSTOM_START + 0) +#define EL_CUSTOM_128 (EL_CUSTOM_START + 127) #define EL_CUSTOM_END (EL_CUSTOM_START + 127) #define NUM_FILE_ELEMENTS 488 @@ -1431,7 +1432,7 @@ #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" -#define PROGRAM_RIGHTS_STRING "Copyright ^1995-2002 by" +#define PROGRAM_RIGHTS_STRING "Copyright ^1995-2003 by" #define PROGRAM_DOS_PORT_STRING "DOS port done by Guido Schulz" #define PROGRAM_IDENT_STRING PROGRAM_VERSION_STRING " " TARGET_STRING #define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING @@ -1655,7 +1656,7 @@ struct NewGraphicInfo int anim_mode; boolean anim_global_sync; -#if defined(TARGET_X11_NATIVE) +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) Pixmap clip_mask; /* single-graphic-only clip mask for X11 */ GC clip_gc; /* single-graphic-only clip gc for X11 */ #endif