--- deliantra/server/include/skills.h	2007/05/12 17:26:51	1.16
+++ deliantra/server/include/skills.h	2009/10/12 14:00:58	1.24
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2003 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 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
+ * 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
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #ifndef SKILLS_H__
@@ -42,11 +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 = 0x08, // skill requires a weapon object
-  SF_NEED_BOW    = 0x10, // skill requires a bow object
-  SF_NEED_ITEM   = 0x20, // skill requires a ranged item
+  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
 };
@@ -79,6 +80,7 @@
 #define IS_GRACE_SKILL(num) (skill_flags [num] & SF_GRACE)
 
 extern const uint8_t skill_flags[NUM_SKILLS];
+// defined in shstr.C for initialisation order
 extern shstr skill_names[NUM_SKILLS];
 
 #endif