X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=c5a79500ed547e960ab515958be62c0ebd18070a;hb=6945f3749927053ee70b47133b2998557a452f75;hp=a7adb261709867776db97bd27d102c182c1e9dab;hpb=a6f92ff31331edb70bdd380518fe217a78788f7e;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index a7adb261..c5a79500 100644 --- a/src/main.h +++ b/src/main.h @@ -111,8 +111,11 @@ #define EP_HAS_CONTENT 45 #define EP_TUBE 46 #define EP_WALL 47 +#define EP_SOLID 48 +#define EP_DRAGONFIRE_PROOF 49 +#define EP_EXPLOSION_PROOF 50 -#define NUM_ELEMENT_PROPERTIES 48 +#define NUM_ELEMENT_PROPERTIES 51 #define NUM_EP_BITFIELDS ((NUM_ELEMENT_PROPERTIES + 31) / 32) #define EP_BITFIELD_BASE 0 @@ -177,6 +180,9 @@ #define HAS_CONTENT(e) HAS_PROPERTY(e, EP_HAS_CONTENT) #define IS_TUBE(e) HAS_PROPERTY(e, EP_TUBE) #define IS_WALL(e) HAS_PROPERTY(e, EP_WALL) +#define IS_SOLID(e) HAS_PROPERTY(e, EP_SOLID) +#define IS_DRAGONFIRE_PROOF(e) HAS_PROPERTY(e, EP_DRAGONFIRE_PROOF) +#define IS_EXPLOSION_PROOF(e) HAS_PROPERTY(e, EP_EXPLOSION_PROOF) #define IS_CUSTOM_ELEMENT(e) ((e) >= EL_CUSTOM_START && \ (e) <= EL_CUSTOM_END) @@ -878,7 +884,7 @@ #define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_PATCH 0 -#define PROGRAM_VERSION_STRING "2.2.0rc6" +#define PROGRAM_VERSION_STRING "2.2.0rc7" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel"