--- deliantra/server/include/define.h	2010/04/02 03:41:24	1.117
+++ deliantra/server/include/define.h	2010/04/06 04:24:29	1.123
@@ -69,12 +69,6 @@
 
 #define ATTUNE_REPELL		16 // levels diff for attune/repell
 
-//TODO: remove all calls to fatal and replace them by cleanup
-#define OUT_OF_MEMORY		0
-#define MAP_ERROR		1
-#define ARCHTABLE_TOO_SMALL	2 // unused
-#define TOO_MANY_ERRORS		3
-
 /* TYPE DEFINES */
 
 /* Only add new values to this list if somewhere in the program code,
@@ -183,7 +177,7 @@
 #define SHOP_FLOOR                        68
 #define SHOP_MAT                          69
 #define RING                              70
-#define FLOOR                             71 /* this is a floor tile -> native layer 0 */
+//#define FLOOR                             71 /* this is a floor tile -> native layer 0 */ // UNUSED???
 #define FLESH                             72 /* animal 'body parts' -b.t. */
 #define INORGANIC                         73 /* metals and minerals */
 #define SKILL_TOOL                        74 /* Allows the use of a skill */
@@ -405,8 +399,7 @@
 #define FLAG_USE_SHIELD	           7	  /* Can this creature use a shield? */
                                    
 #define FLAG_NO_PICK	           8      /* Object can't be picked up */
-#define FLAG_APPLY_ALWAYS          9      /* always apply effects (was: FLAG_WALK_ON) */
-                                   
+/*#define FLAG_WALK_ON             9*/
 /*#define FLAG_NO_PASS	          10*//* Nothing can pass (wall() is true) */
                                   
 #define FLAG_ANIMATE	          11      /* The object looks at archetype for faces */
@@ -594,8 +587,8 @@
                                          * practical reason to exceed this */
 #define LOS_MAX                   4     /* max. los value for non-blocked spaces */
 #define LOS_BLOCKED             100     /* fully blocked spaces */
-#define BRIGHTNESS(xyz)		(xyz)->glow_radius>MAX_LIGHT_RADII? \
-                                  MAX_LIGHT_RADII:(xyz)->glow_radius;
+#define BRIGHTNESS(xyz)		(xyz)->glow_radius>MAX_LIGHT_RADII ? \
+                                  MAX_LIGHT_RADII : (xyz)->glow_radius;
 // player position in blocked_los code
 #define LOS_X0 (MAP_CLIENT_X / 2 - 1)
 #define LOS_Y0 (MAP_CLIENT_Y / 2 - 1)
@@ -703,16 +696,15 @@
 {
   /* Basic flags/mode, always use one of these */
   AP_TOGGLE       = 0,
-  AP_APPLY        = 1,
-  AP_UNAPPLY      = 2,
-
-  AP_BASIC_FLAGS  = 0x0f,
+  AP_APPLY        = 0x01,
+  AP_UNAPPLY      = 0x02,
+  AP_MODE         = 0x03,
 
   /* Optional flags, for bitwise or with a basic flag */
   AP_NO_MERGE     = 0x10,
   AP_IGNORE_CURSE = 0x20,
   AP_PRINT        = 0x40, /* Print what to do, don't actually do it */
-  AP_HAVE_WEAPON  = 0x80, // when applying a skill, assume we have the required weapon
+  AP_NO_SLOT      = 0x80, // do not update the combat/ranged/current slots
 };
 
 /* Bitmask values for 'can_apply_object()' return values.
@@ -741,9 +733,10 @@
  *      could remove.
  *
  */
-#define CAN_APPLY_NEVER		    0x1
-#define CAN_APPLY_RESTRICTION	    0x2
-#define CAN_APPLY_NOT_MASK	    0xf
+#define CAN_APPLY_NEVER		    0x01
+#define CAN_APPLY_RESTRICTION	    0x02
+#define CAN_APPLY_NOT_MASK	    0x0f
+
 #define CAN_APPLY_UNAPPLY	    0x10
 #define CAN_APPLY_UNAPPLY_MULT	    0x20
 #define CAN_APPLY_UNAPPLY_CHOICE    0x40