--- deliantra/server/include/define.h	2006/12/30 10:16:10	1.33
+++ deliantra/server/include/define.h	2007/01/15 21:06:19	1.40
@@ -1,25 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2003-2005 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at crossfire@schmorp.de
-*/
+ * 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
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at crossfire@schmorp.de
+ */
 
 /* This file is best viewed with a window width of about 100 character */
 
@@ -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)
@@ -813,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"
 
 /*
@@ -966,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.