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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.94 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.102 by root, Sat Apr 23 04:56:57 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * 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
 # 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)
     if (tmp->type == SKILL && tmp->subtype == skillno)
       if (object *skop = find_skill_by_name (who, tmp->skill))
         return skop;
   return 0;
+}
+object *
+object::give_skill (shstr_cmp name, bool can_use)
+{
+  object *skill = find_skill (this, name);
+  if (!skill)
+    skill = give_skill_by_name (this, name);
+  if (skill && can_use)
+    skill->flag [FLAG_CAN_USE_SKILL] = true;
+  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
         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;
     return 100;
   return rv;
 }
+static int
+cmp_skillp (const void *sk1, const void *sk2)
+{
+  return strcmp (&((*(const object **) sk1)->name),
+                 &((*(const object **) sk2)->name));
+}
 /* show_skills() - Meant to allow players to examine
  * their current skill list.
  * This shows the amount of exp they have in the skills.
  * we also include some other non skill related info (god,
  * max weapon improvments, item power).
  * Note this function is a bit more complicated becauase we
  * we want ot sort the skills before printing them.  If we
  * just dumped this as we found it, this would be a bit
  * simpler.
  */
-//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
 void
 show_skills (object *pl, const char *search)
 {
   const char *cp;
   int i, num_skills_found = 0;
-  const char *const periods = ".............................."; // 30
+  object *skills[CS_NUM_SKILLS];
-  /* Need to have a pointer and use strdup for qsort to work properly */
-  char skills[NUM_SKILLS][128]; // d'oh
   object *op = pl->contr->ob;
+  /* find the skills */
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     {
       if (tmp->type == SKILL)
         {
           if (search && !tmp->name.contains (search))
             continue;
-          char buf[30];
+          skills[num_skills_found++] = tmp;
-          /* Basically want to fill this out to 30 spaces with periods */
-          snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
-          if (settings.permanent_exp_ratio)
-            snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
-                      buf, tmp->level, tmp->stats.exp,
-                      level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
-          else
-            snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
-                      buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
           /* I don't know why some characters get a bunch of skills, but
            * it sometimes happens (maybe a leftover from bugier earlier code
            * and those character are still about).  In any case, lets handle
            * it so it doesn't crash the server - otherwise, one character may
            * crash the server numerous times.
            */
-          if (num_skills_found >= NUM_SKILLS)
+          if (num_skills_found >= CS_NUM_SKILLS)
             {
               new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
               new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
               break;
             }
   dynbuf_text &msg = msg_dynbuf; msg.clear ();
   msg << "T<Player skills:>\n\n";
   if (num_skills_found > 1)
-    qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
+    qsort (skills, num_skills_found, sizeof (skills [0]), cmp_skillp);
+  char buf[31]; /* +1 for '\0' */
+  const char *const periods = ".............................."; // 30
-  for (i = 0; i < num_skills_found; i++)
+  for (i = 0; i < num_skills_found; i++) {
-    msg << " C<" << skills [i] << ">\n";
+    object *tmp = skills[i];
+    /* Basically want to fill this out to 30 spaces with periods */
+    snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
+    msg << " C<";
+    if (settings.permanent_exp_ratio)
+      msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
+                  buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul),
+		  clipped_percent (tmp->perm_exp, tmp->stats.exp));
+    else
+      msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
+                  buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
+    msg << ">\n";
+  }
   msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
   cp = determine_god (op);
   msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
                 }
             }
           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)
         {

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.94 by root, Sun Apr 11 00:34:06 2010 UTC vs. Revision 1.102 by root, Sat Apr 23 04:56:57 2011 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.94 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.102 by root, Sat Apr 23 04:56:57 2011 UTC