--- deliantra/server/include/skills.h	2007/04/30 04:25:30	1.14
+++ deliantra/server/include/skills.h	2007/05/19 00:31:08	1.18
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2003 Mark Wedel & Crossfire Development Team
@@ -42,10 +42,12 @@
 
 enum {
   SF_COMBAT      = 0x01, // skill is used only in direct attack combat
-  SF_RANGED      = 0x02, // skill is only used for ranged attacks
-  SF_READY       = 0x04, // skill can be used but is directionless
-  SF_NEED_WEAPON = 0x10, // skill requires a weapon object
-  SF_NEED_BOW    = 0x20, // skill requires a bow object
+  SF_NEED_WEAPON = 0x02, // skill requires a weapon object
+  SF_RANGED      = 0x04, // skill is only used for ranged attacks
+  SF_NEED_BOW    = 0x08, // skill requires a bow object
+  SF_USE         = 0x10, // skill can be used but is directionless
+  SF_APPLY       = 0x20, // skill can be independently applied and is never a chosen skill
+
   SF_MANA        = 0x40, // skill requires a mana-consuming spell
   SF_GRACE       = 0x80, // skill can use a grace-consuming spell
 };
@@ -66,6 +68,7 @@
  * that should be used to calculate wc's and the like.
  */
 #define IS_COMBAT_SKILL(num) (skill_flags [num] & SF_COMBAT)
+#define IS_RANGED_SKILL(num) (skill_flags [num] & SF_RANGED)
 
 /* Like IS_COMBAT_SKILL above, but instead this is used to determine
  * how many mana points the player has.