rnd-19981227-1

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 26861a7402cf338e3a767eeb2999edef42f6be85..3c77e192ba7186cd04fbf620ebdfc818871b62c9 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -96,33 +96,34 @@ typedef unsigned char byte;
 #define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
 #define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
 
-#define EP_BIT_AMOEBALIVE      (1<<0)
-#define EP_BIT_AMOEBOID                (1<<1)
-#define EP_BIT_SCHLUESSEL      (1<<2)
-#define EP_BIT_PFORTE          (1<<3)
-#define EP_BIT_SOLID           (1<<4)
-#define EP_BIT_MASSIV          (1<<5)
-#define EP_BIT_SLIPPERY                (1<<6)
-#define EP_BIT_ENEMY           (1<<7)
-#define EP_BIT_MAUER           (1<<8)
-#define EP_BIT_CAN_FALL                (1<<9)
-#define EP_BIT_CAN_SMASH       (1<<10)
-#define EP_BIT_CAN_CHANGE      (1<<11)
-#define EP_BIT_CAN_MOVE                (1<<12)
-#define EP_BIT_COULD_MOVE      (1<<13)
-#define EP_BIT_DONT_TOUCH      (1<<14)
-#define EP_BIT_DONT_GO_TO      (1<<15)
-#define EP_BIT_MAMPF2          (1<<16)
-#define EP_BIT_CHAR            (1<<17)
-#define EP_BIT_BD_ELEMENT      (1<<18)
-#define EP_BIT_SB_ELEMENT      (1<<19)
-#define EP_BIT_GEM             (1<<20)
-#define EP_BIT_INACTIVE                (1<<21)
-#define EP_BIT_EXPLOSIVE       (1<<22)
-#define EP_BIT_MAMPF3          (1<<23)
-#define EP_BIT_PUSHABLE                (1<<24)
-#define EP_BIT_PLAYER          (1<<25)
-#define EP_BIT_HAS_CONTENT     (1<<26)
+#define EP_BIT_AMOEBALIVE      (1 << 0)
+#define EP_BIT_AMOEBOID                (1 << 1)
+#define EP_BIT_SCHLUESSEL      (1 << 2)
+#define EP_BIT_PFORTE          (1 << 3)
+#define EP_BIT_SOLID           (1 << 4)
+#define EP_BIT_MASSIV          (1 << 5)
+#define EP_BIT_SLIPPERY                (1 << 6)
+#define EP_BIT_ENEMY           (1 << 7)
+#define EP_BIT_MAUER           (1 << 8)
+#define EP_BIT_CAN_FALL                (1 << 9)
+#define EP_BIT_CAN_SMASH       (1 << 10)
+#define EP_BIT_CAN_CHANGE      (1 << 11)
+#define EP_BIT_CAN_MOVE                (1 << 12)
+#define EP_BIT_COULD_MOVE      (1 << 13)
+#define EP_BIT_DONT_TOUCH      (1 << 14)
+#define EP_BIT_DONT_GO_TO      (1 << 15)
+#define EP_BIT_MAMPF2          (1 << 16)
+#define EP_BIT_CHAR            (1 << 17)
+#define EP_BIT_BD_ELEMENT      (1 << 18)
+#define EP_BIT_SB_ELEMENT      (1 << 19)
+#define EP_BIT_GEM             (1 << 20)
+#define EP_BIT_INACTIVE                (1 << 21)
+#define EP_BIT_EXPLOSIVE       (1 << 22)
+#define EP_BIT_MAMPF3          (1 << 23)
+#define EP_BIT_PUSHABLE                (1 << 24)
+#define EP_BIT_PLAYER          (1 << 25)
+#define EP_BIT_HAS_CONTENT     (1 << 26)
+#define EP_BIT_EATABLE         (1 << 27)
 
 #define IS_AMOEBALIVE(e)       (Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
 #define IS_AMOEBOID(e)         (Elementeigenschaften[e] & EP_BIT_AMOEBOID)
@@ -151,6 +152,7 @@ typedef unsigned char byte;
 #define IS_PUSHABLE(e)         (Elementeigenschaften[e] & EP_BIT_PUSHABLE)
 #define ELEM_IS_PLAYER(e)      (Elementeigenschaften[e] & EP_BIT_PLAYER)
 #define HAS_CONTENT(e)         (Elementeigenschaften[e] & EP_BIT_HAS_CONTENT)
+#define IS_EATABLE(e)          (Elementeigenschaften[e] & EP_BIT_EATABLE)
 
 #define IS_PLAYER(x,y)         (ELEM_IS_PLAYER(StorePlayer[x][y]))
 
@@ -1131,10 +1133,10 @@ extern int              num_bg_loops;
 
 /* directions for moving */
 #define MV_NO_MOVING           0
-#define MV_LEFT                        (1<<0)
-#define MV_RIGHT               (1<<1)
-#define MV_UP                  (1<<2)
-#define MV_DOWN                        (1<<3)
+#define MV_LEFT                        (1 << 0)
+#define MV_RIGHT               (1 << 1)
+#define MV_UP                  (1 << 2)
+#define MV_DOWN                        (1 << 3)
 
 /* font types */
 #define FS_SMALL               0