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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC vs.
Revision 1.100 by root, Mon May 17 21:14:10 2010 UTC

 # define def(uc, flags) flags,
 #  include "skillinc.h"
 # undef def
 };
+vector<object_ptr> skillvec;
 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);
 /* init_skills basically just sets up the skill_names table
  * above.  The index into the array is set up by the
  * subtypes.
  */
 void
 init_skills ()
 {
-  for_all_archetypes (at)
+  // nop
-    if (at->type == SKILL)
+}
+void
+add_skill_archetype (object *o)
+{
+  assert (("skill name must equal skill skill", o->name == o->skill));
+  for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
+    if ((*i)->name == o->name)
       {
-        if (skill_names[at->subtype])
+        // replace existing entry
-          LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
+        SKILL_INDEX (o) = i - skillvec.begin ();
-               at->subtype, &skill_names[at->subtype], &at->skill);
+        *i = o;
-        else
+        return;
-          skill_names[at->subtype] = at->skill;
       }
-  /* This isn't really an error if there is no skill subtype set, but
+  // add new entry
-   * checking for this may catch some user errors.
+  assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
-   */
+  SKILL_INDEX (o) = skillvec.size ();
-  for (int i = 1; i < NUM_SKILLS; i++)
+  skillvec.push_back (o);
-    if (!skill_names[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 -
  * mostly used for sending exp.
  */
 void
 player::link_skills ()
 {
-  for (int i = 0; i < NUM_SKILLS; ++i)
+  for (int i = 0; i < CS_NUM_SKILLS; ++i)
     last_skill_ob [i] = 0;
   for (object *tmp = ob->inv; tmp; tmp = tmp->below)
     if (tmp->type == SKILL)
       {
+        int idx = SKILL_INDEX (tmp);
-        assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS));
+        assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
-        if (last_skill_ob [tmp->subtype] != tmp)
+        if (last_skill_ob [idx] != tmp)
           {
-            /* This is really a warning, hence no else below */
-            if (last_skill_ob [tmp->subtype])
-              LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
-                   &last_skill_ob [tmp->subtype]->skill, &tmp->skill);
-            last_skill_ob [tmp->subtype] = tmp;
+            last_skill_ob [idx] = tmp;
             if (ns)
-              ns->last_skill_exp [tmp->subtype] = -1;
+              ns->last_skill_exp [idx] = -1;
           }
       }
 }
 static object *
       return splay (tmp);
   return 0;
 }
+object *
-object *player::find_skill (shstr_cmp name) const
+player::find_skill (shstr_cmp name) const
 {
   // might want to use last_skill_obj at one point, or maybe not
   return ::find_skill (ob, name);
 }
   /* Player has a tool to use the skill. If not applied, apply it -
    * if not successful, return null. If they do have the skill tool
    * but not the skill itself, give it to them.
    */
-  object *skill = find_skill (who, skill_tool->skill);
+  object *skill = who->give_skill (skill_tool->skill);
-  if (!skill)
-    skill = give_skill_by_name (who, skill_tool->skill);
   if (!skill_tool->flag [FLAG_APPLIED])
     if (!who->apply (splay (skill_tool)))
       return 0;
  * tool, this code will equip it.
  *
  * This code is basically the same as find_skill_by_name() above,
  * but instead a skill name, we search by matching number.
  * this replaces find_skill.
+ *
+ * MUST NOT BE USED IN NEW CODE! (schmorp)
  */
 object *
 find_skill_by_number (object *who, int skillno)
 {
   for (object *tmp = who->inv; tmp; tmp = tmp->below)
         return skop;
   return 0;
 }
-/* This changes the objects chosen_skill to new_skill.
+object *
- * return 1 on success, 0 on error
+object::give_skill (shstr_cmp name, bool can_use)
- */
-bool
-object::change_skill (object *new_skill)
 {
-  if (type != PLAYER)
+  object *skill = find_skill (this, name);
-    return 0;
-  // optimise this supposedly common case
-  if (new_skill == chosen_skill)
-    return 1;
-  if (chosen_skill)
+  if (!skill)
-    {
+    skill = give_skill_by_name (this, name);
-      chosen_skill->flag [FLAG_APPLIED] = false;
-      change_abil (this, chosen_skill);
-    }
-  chosen_skill = new_skill;
+  if (skill && can_use)
+    skill->flag [FLAG_CAN_USE_SKILL] = true;
-  if (chosen_skill)
-    {
-      chosen_skill->flag [FLAG_APPLIED] = true;
-      change_abil (this, chosen_skill);
-    }
-  // always clear current weapon, as the selected skill could
-  // conflict with the current weapon skill, which would go
-  // undetected and exp would be given to the wrong skill.
-  current_weapon = 0;
-  update_stats ();
-  return 1;
+  return skill;
 }
 /* do_skill() - Main skills use function-similar in scope to cast_spell().
  * We handle all requests for skill use outside of some combat here.
  * We require a separate routine outside of fire() so as to allow monsters
         /* Not 100% sure if this will work with new movement code -
          * the levitation skill has move_type for flying, so when
          * equipped, that should transfer to player, when not,
          * shouldn't.
          */
-        if (QUERY_FLAG (skill, FLAG_APPLIED))
+        if (skill->flag [FLAG_APPLIED])
           {
-            CLEAR_FLAG (skill, FLAG_APPLIED);
+            skill->clr_flag (FLAG_APPLIED);
             new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
           }
         else
           {
-            SET_FLAG (skill, FLAG_APPLIED);
+            skill->set_flag (FLAG_APPLIED);
             new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
           }
         op->update_stats ();
         success = 1;
           for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
             {
               next = tmp->above;
-              if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
+              if (tmp->flag [FLAG_IS_CAULDRON])
                 {
                   found_cauldron = true;
                   if (tmp->skill != skill->skill)
                     {
                       break;
                     }
                   attempt_do_alchemy (op, tmp, skill);
-                  if (QUERY_FLAG (tmp, FLAG_APPLIED))
+                  if (tmp->flag [FLAG_APPLIED])
                     esrv_send_inventory (op, tmp);
                 }
             }
           if (!found_cauldron)
         new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
         break;
       case SK_MINING:
         success = skill_mining (op, part, skill, dir, string);
-        break;
-      case SK_FISHING:
-        success = skill_fishing (op, part, skill, dir, string);
         break;
       default:
         LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
         break;
     }
   else
     {                           /* all other items/living creatures */
       op_exp = op->stats.exp;
       op_lvl = op->level;
-      if (!QUERY_FLAG (op, FLAG_ALIVE))
+      if (!op->flag [FLAG_ALIVE])
         op_lvl += 5 * abs (op->magic); /* for ident/make items */
     }
   if (op_lvl < 1)
     op_lvl = 1;
     }
   object *tmp = find_skill (pl, scroll->skill);
   /* player already knows it */
-  if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
+  if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
     return 0;
   /* now a random change to learn, based on player Int.
    * give bonus based on level - otherwise stupid characters
    * might never be able to learn anything.
     {
       LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
       return 2;
     }
-  SET_FLAG (tmp, FLAG_CAN_USE_SKILL);
+  tmp->set_flag (FLAG_CAN_USE_SKILL);
   return 1;
 }
 /* Gives a percentage clipped to 0% -> 100% of a/b. */
  */
 static object *
 find_player_hth_skill (object *op)
 {
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
-    if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp))
+    if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
       return tmp;
   return 0;
 }
         }
       else
         {
           if (!pl->combat_ob)
             {
-              if (QUERY_FLAG (op, FLAG_READY_WEAPON))
+              if (op->flag [FLAG_READY_WEAPON])
                 {
                   for (tmp = op->inv; tmp; tmp = tmp->below)
-                    if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
+                    if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
                       break;
                   if (!tmp)
                     LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
                 }
             }
           if (!op->apply (pl->combat_ob))
             return 0;
+          if (!op->chosen_skill)
+            {
+              LOG (llevError, "do_skill_attack: weapon has no skill (%s)", pl->combat_ob->debug_desc ());
+              new_draw_info (NDI_RED | NDI_REPLY, 0, op, "You hit a bug in the server, please contact an admin!");
+              return 0;
+            }
         }
       /* lose invisiblity/hiding status for running attacks */
       if (pl->tmp_invis)
         {
   int success = attack_ob (tmp, op);
   /* print appropriate  messages to the player */
-  if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))
+  if (success && string && tmp && !tmp->flag [FLAG_FREED])
     {
       if (op->type == PLAYER)
         new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
       else if (tmp->type == PLAYER)
         new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
       /* space must be blocked for there to be anything interesting to do */
       if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
         return 0;
       for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
-        if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR)
+        if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
           {
             /* Don't attack party members */
             if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
               return 0;
 static int
 attack_hth (object *pl, int dir, const char *string, object *skill)
 {
   object *enemy = NULL, *weapon;
-  if (QUERY_FLAG (pl, FLAG_READY_WEAPON))
+  if (pl->flag [FLAG_READY_WEAPON])
     for (weapon = pl->inv; weapon; weapon = weapon->below)
       {
-        if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))
+        if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
           {
-            CLEAR_FLAG (weapon, FLAG_APPLIED);
+            weapon->clr_flag (FLAG_APPLIED);
-            CLEAR_FLAG (pl, FLAG_READY_WEAPON);
+            pl->clr_flag (FLAG_READY_WEAPON);
             pl->update_stats ();
             if (pl->type == PLAYER)
               {
                 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
                 esrv_update_item (UPD_FLAGS, pl, weapon);
  */
 static int
 attack_melee_weapon (object *op, int dir, const char *string, object *skill)
 {
-  if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
+  if (!op->flag [FLAG_READY_WEAPON])
     {
       if (op->type == PLAYER)
         new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
       return 0;

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC vs. Revision 1.100 by root, Mon May 17 21:14:10 2010 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC vs.
Revision 1.100 by root, Mon May 17 21:14:10 2010 UTC