--- deliantra/server/include/define.h	2006/12/20 14:48:10	1.28
+++ 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
 
@@ -423,9 +424,9 @@
  */
 
 /* Basic routines to do above */
-#define SET_FLAG(obj, flag)   (obj)->flags[flag] = 1
-#define CLEAR_FLAG(obj, flag) (obj)->flags[flag] = 0
-#define QUERY_FLAG(obj, flag) (obj)->flags[flag]
+#define SET_FLAG(obj, flg)   (obj)->flag [flg] = 1
+#define CLEAR_FLAG(obj, flg) (obj)->flag [flg] = 0
+#define QUERY_FLAG(obj, flg) (obj)->flag [flg]
 
 /* the flags */
 
@@ -582,22 +583,24 @@
 #define FLAG_NO_ATTACK          101    /* monster don't attack */
 #define FLAG_NO_DAMAGE          102    /* monster can't be damaged */
 #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_AFK                 111   /* Player is AFK */
-#define NUM_FLAGS                111   /* Should always be equal to the last
-                                         * defined flag.  If you change this,
-                                         * make sure you update the flag_links
-                                         * in common/loader.l
-                                         */
+#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                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.
@@ -659,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)
@@ -811,26 +814,11 @@
 #define LO4     15             /* bitmasks for upper and lower 4 bits from 8 bit fields */
 #define HI4    240
 
-/*
- * Use of the state-variable in player objects:
- */
-
-#define ST_PLAYING      0
-#define ST_PLAY_AGAIN   1
-#define ST_ROLL_STAT    2
-#define ST_CHANGE_CLASS 3
-#define ST_CONFIRM_QUIT 4
-#define ST_CONFIGURE    5
-#define ST_GET_NAME     6
-#define ST_GET_PASSWORD 7
-#define ST_CONFIRM_PASSWORD     8
-#define ST_GET_PARTY_PASSWORD 10
-
-#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"
 
 /*
@@ -979,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.