--- deliantra/server/include/define.h	2006/12/23 15:49:40	1.32
+++ deliantra/server/include/define.h	2007/01/06 14:42:30	1.36
@@ -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,6 +582,8 @@
 #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
@@ -811,11 +814,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"
 
 /*
@@ -964,7 +967,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.