--- deliantra/server/include/define.h	2007/01/02 22:26:27	1.35
+++ deliantra/server/include/define.h	2007/01/15 00:40:49	1.39
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2003-2005 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -581,25 +582,25 @@
 #define FLAG_NEUTRAL            100    /* monster is from type neutral */
 #define FLAG_NO_ATTACK          101    /* monster don't attack */
 #define FLAG_NO_DAMAGE          102    /* monster can't be damaged */
-
-//TODO schmorp: removed in rewrite, not yet readded
 #define FLAG_OBJ_ORIGINAL       103    /* NEVER SET THIS.  Item was loaded by
-                                         * load_original_map() */
+                                        * load_original_map() */
 #define FLAG_OBJ_SAVE_ON_OVL    104    /* this object should be saved on
-                                         * the overlay, and is not subject to
-                                         * decay. */
+                                        * the overlay, and is not subject to
+                                        * decay. */
 #define FLAG_ACTIVATE_ON_PUSH    105   /* connected object is activated when 'pushed' */
 #define FLAG_ACTIVATE_ON_RELEASE 106   /* connected object is activated when 'released' */
 #define FLAG_IS_WATER            107
 #define FLAG_CONTENT_ON_GEN      108
 #define FLAG_IS_A_TEMPLATE       109   /* Object has no ingame life until instanciated */
 #define FLAG_IS_BUILDABLE        110   /* Can build on item */
+#define FLAG_DESTROY_ON_DEATH    111   /* Object will be destroyed when env dies */
+#define FLAG_NO_SAVE             112   // item doesn't get saved with map
 
-#define NUM_FLAGS                111   /* Should always be equal to the last
-                                         * defined flag + 1. If you change this,
-                                         * make sure you update the flag_links
-                                         * in common/loader.l
-                                         */
+#define NUM_FLAGS                113   /* Should always be equal to the last
+                                        * defined flag + 1. If you change this,
+                                        * make sure you update the flag_links
+                                        * in common/loader.l
+                                        */
 
 /* Values can go up to 127 before the size of the flags array in the
  * object structure needs to be enlarged.
@@ -661,7 +662,7 @@
  * 
  */
 #define OB_TYPE_MOVE_BLOCK(ob1, type) \
-    ( (type != 0) && (ob1->move_type & type) == ob1->move_type)
+    ((type) && (ob1->move_type & type) == ob1->move_type)
 
 
 #define SET_GENERATE_TYPE(xyz,va)	(xyz)->stats.sp=(va)