--- deliantra/server/include/define.h	2006/12/30 10:16:10	1.33
+++ deliantra/server/include/define.h	2007/01/07 23:10:43	1.37
@@ -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,8 +582,6 @@
 #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() */
 #define FLAG_OBJ_SAVE_ON_OVL    104    /* this object should be saved on
@@ -594,8 +593,9 @@
 #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 NUM_FLAGS                111   /* Should always be equal to the last
+#define NUM_FLAGS                112   /* 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
@@ -813,11 +813,11 @@
 #define LO4     15             /* bitmasks for upper and lower 4 bits from 8 bit fields */
 #define HI4    240
 
-#define BLANK_FACE_NAME "blank.111"
-#define EMPTY_FACE_NAME "empty.111"
-#define DARK_FACE1_NAME		"dark1.111"
-#define DARK_FACE2_NAME		"dark2.111"
-#define DARK_FACE3_NAME		"dark3.111"
+#define BLANK_FACE_NAME "blank.x11"
+#define EMPTY_FACE_NAME "empty.x11"
+#define DARK_FACE1_NAME		"dark1.x11"
+#define DARK_FACE2_NAME		"dark2.x11"
+#define DARK_FACE3_NAME		"dark3.x11"
 #define SMOOTH_FACE_NAME	"default_smoothed.111"
 
 /*
@@ -966,7 +966,7 @@
 #define CAN_APPLY_UNAPPLY_CHOICE    0x40
 
 /* Cut off point of when an object is put on the active list or not */
-#define MIN_ACTIVE_SPEED	0.00001
+#define MIN_ACTIVE_SPEED	1e-5
 
 /*
  * random() is much better than rand().  If you have random(), use it instead.