[ViewVC] Diff of: cvs/deliantra/server/server/skill

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.33 by root, Mon Apr 30 04:25:30 2007 UTC

 #include <object.h>
 #include <sproto.h>
 #include <living.h>             /* for defs of STR,CON,DEX,etc. -b.t. */
 #include <spells.h>
-/* Table of unarmed attack skills.  Terminated by -1.  This
+const uint8_t skill_flags[NUM_SKILLS] = {
- * is also the list that we should try to use skills when
+# define def(uc, flags) flags,
- * automatically applying one for the player.
+#  include "skillinc.h"
- */
+# undef def
-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);
  * subtypes.
  */
 void
 init_skills (void)
 {
-  int i;
-  archetype *at;
-  for (at = first_archetype; at != NULL; at = at->next)
+  for (archetype *at = first_archetype; at; at = at->next)
     if (at->clone.type == SKILL)
       {
-        if (skill_names[at->clone.subtype] != NULL)
+        if (skill_names[at->clone.subtype])
           LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
                at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);
         else
           skill_names[at->clone.subtype] = at->clone.skill;
       }
   /* This isn't really an error if there is no skill subtype set, but
    * checking for this may catch some user errors.
    */
-  for (i = 1; i < NUM_SKILLS; i++)
+  for (int i = 1; i < NUM_SKILLS; i++)
-    {
-      if (!skill_names[i])
+    if (!skill_names[i])
-        LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
+      LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
-    }
 }
 /* This function goes through the player inventory and sets
  * up the last_skills[] array in the player object.
  * the last_skills[] is used to more quickly lookup skills -
       if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
         {
           if (apply_special (who, skill_tool, 0))
             return NULL;
         }
       if (!skill)
         {
           skill = give_skill_by_name (who, skill_tool->skill);
           link_player_skills (who);
         }
       return skill;
     }
   return NULL;
 }
 /* This returns the skill pointer of the given name (the
   int old_range;
   if (who->type != PLAYER)
     return 0;
-  old_range = who->contr->shoottype;
   if (who->chosen_skill && who->chosen_skill == new_skill)
     {
-      /* optimization for changing skill to current skill */
+      //who->contr->combat_skill = who->chosen_skill;
-      if (!(flag & 0x1))
-        who->contr->set_range (range_skill);
       return 1;
+    }
+  if (!new_skill)
+    {
+      if (who->chosen_skill)
+        apply_special (who, who->chosen_skill, AP_UNAPPLY);
+      /* Only goal in this case was to unapply a skill */
+      return 0;
     }
   // move skill to front, so it will be preferred next time
   new_skill->remove ();
   who->insert (new_skill);
-  if (!new_skill)
-    {
-      if (who->chosen_skill)
-          apply_special (who, who->chosen_skill, AP_UNAPPLY);
-      /* Only goal in this case was to unapply a skill */
-      return 0;
-    }
   if (apply_special (who, new_skill, AP_APPLY))
     return 0;
-  if (!(flag & 0x1))
-    who->contr->set_range ((rangetype) old_range);
   return 1;
 }
 /* This function just clears the chosen_skill and range_skill values
- * inthe player.
+ * in the player.
  */
 void
 clear_skill (object *who)
 {
-  who->chosen_skill = NULL;
+  who->chosen_skill = 0;
   CLEAR_FLAG (who, FLAG_READY_SKILL);
   if (who->type == PLAYER)
     {
+      if (who->contr->ranged_skill && who->contr->ranged_skill->type == SKILL)
+        {
-      who->contr->ranges[range_skill] = NULL;
+          who->contr->ranged_skill = 0;
-      if (who->contr->shoottype == range_skill)
+          who->contr->ranged_ob    = 0;
-        who->contr->shoottype = range_none;
+        }
     }
 }
 /* do_skill() - Main skills use function-similar in scope to cast_spell().
  * We handle all requests for skill use outside of some combat here.
  * op is the object that was 'defeated'.
  * skill is the skill used.  If no skill is used, it should just
  * point back to who.
  *
  */
 int
 calc_skill_exp (object *who, object *op, object *skill)
 {
   int op_exp = 0, op_lvl = 0;
   float base, value, lvl_mult = 0.0;
  * This one actually teaches the player the skill as something
  * they can equip.
  * Return 0 if the player knows the skill, 1 if the
  * player learns the skill, 2 otherwise.
  */
 int
 learn_skill (object *pl, object *scroll)
 {
   object *tmp;
 }
 static bool
 hth_skill_p (object *skill)
 {
-  for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i)
+  return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT;
-    if (skill->subtype == unarmed_skills[i])
-      return 1;
-  return 0;
 }
 /* This finds the first unarmed skill the player has, and returns it.
  */
 static object *

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC vs. Revision 1.33 by root, Mon Apr 30 04:25:30 2007 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.33 by root, Mon Apr 30 04:25:30 2007 UTC