X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=763195b9b7aa6db58295ea39d476d1c243ba294f;hb=852a8eef1e8858a40da0be4093eba3deaf468f51;hp=2866d903601970bb802d24762d3987058d733751;hpb=56356dc9e2d4a856879a3c91aa7212d0a80afdfd;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 2866d903..763195b9 100644 --- a/src/main.h +++ b/src/main.h @@ -1949,8 +1949,8 @@ /* program information and versioning definitions */ #define PROGRAM_VERSION_MAJOR 3 #define PROGRAM_VERSION_MINOR 2 -#define PROGRAM_VERSION_PATCH 4 -#define PROGRAM_VERSION_BUILD 2 +#define PROGRAM_VERSION_PATCH 5 +#define PROGRAM_VERSION_BUILD 0 #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" @@ -1960,11 +1960,11 @@ #define PROGRAM_GAME_BY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_UNIX_DATADIR_STRING ".rocksndiamonds" -#if CREATE_SPECIAL_EDITION_RND_JUE +#if defined(CREATE_SPECIAL_EDITION_RND_JUE) #undef PROGRAM_TITLE_STRING -#define PROGRAM_TITLE_STRING "R'n'D - Version Jue" +#define PROGRAM_TITLE_STRING "R'n'D jue" #undef PROGRAM_UNIX_DATADIR_STRING -#define PROGRAM_UNIX_DATADIR_STRING ".rocksndiamonds-jue" +#define PROGRAM_UNIX_DATADIR_STRING ".rnd_jue" #endif #define ICON_TITLE_STRING PROGRAM_TITLE_STRING @@ -2403,6 +2403,7 @@ struct ElementChangeInfo short actual_trigger_element; /* element that actually triggered change */ int actual_trigger_side; /* element side that triggered the change */ int actual_trigger_player; /* player which actually triggered change */ + int actual_trigger_player_bits; /* player bits of triggering players */ int actual_trigger_ce_value; /* CE value of element that triggered change */ int actual_trigger_ce_score; /* CE score of element that triggered change */ @@ -2685,6 +2686,7 @@ extern Bitmap *bitmap_db_cross; extern Bitmap *bitmap_db_field; extern Bitmap *bitmap_db_panel; extern Bitmap *bitmap_db_door; +extern Bitmap *bitmap_db_toons; extern Pixmap tile_clipmask[]; extern DrawBuffer *fieldbuffer; extern DrawBuffer *drawto_field;