--- deliantra/server/server/skill_util.C	2006/09/12 00:26:16	1.10
+++ deliantra/server/server/skill_util.C	2006/09/12 00:53:57	1.11
@@ -1,7 +1,7 @@
 
 /*
  * static char *rcsid_skill_util_c =
- *   "$Id: skill_util.C,v 1.10 2006/09/12 00:26:16 root Exp $";
+ *   "$Id: skill_util.C,v 1.11 2006/09/12 00:53:57 root Exp $";
  */
 
 /*
@@ -45,8 +45,6 @@
 
 /* #define SKILL_UTIL_DEBUG */
 
-#define WANT_UNARMED_SKILLS
-
 #include <global.h>
 #include <object.h>
 #ifndef __CEXTRACT__
@@ -55,6 +53,24 @@
 #include <living.h>             /* for defs of STR,CON,DEX,etc. -b.t. */
 #include <spells.h>
 
+/* Table of unarmed attack skills.  Terminated by -1.  This
+ * is also the list that we should try to use skills when
+ * automatically applying one for the player.
+ * Note it is hardcoded in the skill_util.c that dragons always
+ * want clawing if possible.
+ */
+static uint8 unarmed_skills[] = {
+  SK_KARATE,
+  SK_CLAWING,
+  SK_FLAME_TOUCH,
+  SK_SPARK_TOUCH,
+  SK_SHIVER,
+  SK_ACID_SPLASH,
+  SK_POISON_NAIL,
+  SK_PUNCHING,
+  (uint8)-1
+};
+
 static int attack_hth (object *pl, int dir, const char *string, object *skill);
 static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);