--- deliantra/server/include/define.h	2010/04/02 03:41:24	1.117
+++ deliantra/server/include/define.h	2010/04/03 02:27:24	1.118
@@ -703,16 +703,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 +740,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