projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030425-1-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index a690c06446194b726e13642a0a7bc82be0c2ed6b..c5a79500ed547e960ab515958be62c0ebd18070a 100644
(file)
--- 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_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
#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 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)
#define IS_CUSTOM_ELEMENT(e) ((e) >= EL_CUSTOM_START && \
(e) <= EL_CUSTOM_END)
@@
-846,10
+852,10
@@
#define FONT_TEXT_2 9
#define FONT_TEXT_3 10
#define FONT_TEXT_4 11
#define FONT_TEXT_2 9
#define FONT_TEXT_3 10
#define FONT_TEXT_4 11
-#define FONT_INPUT_1
12
-#define FONT_INPUT_1
_ACTIVE
13
-#define FONT_INPUT_2
14
-#define FONT_INPUT_2
_ACTIVE
15
+#define FONT_INPUT_1
_ACTIVE
12
+#define FONT_INPUT_1
13
+#define FONT_INPUT_2
_ACTIVE
14
+#define FONT_INPUT_2
15
#define FONT_OPTION_OFF 16
#define FONT_OPTION_ON 17
#define FONT_VALUE_1 18
#define FONT_OPTION_OFF 16
#define FONT_OPTION_ON 17
#define FONT_VALUE_1 18
@@
-878,7
+884,7
@@
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 2
#define PROGRAM_VERSION_PATCH 0
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 2
#define PROGRAM_VERSION_PATCH 0
-#define PROGRAM_VERSION_STRING "2.2.0rc
6
"
+#define PROGRAM_VERSION_STRING "2.2.0rc
7
"
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"