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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC vs.
Revision 1.64 by root, Mon Sep 22 01:33:10 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
             new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
           }
         else
           {
             SET_FLAG (skill, FLAG_APPLIED);
-            new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");
+            new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
           }
         op->update_stats ();
         success = 1;
         break;
       case SK_HIDING:
         exp = success = hide (op, skill);
         break;
       case SK_JUMPING:
-        success = jump (op, dir, skill);
+        exp = success = jump (op, dir, skill);
         break;
       case SK_INSCRIPTION:
         exp = success = write_on_item (op, string, skill);
         break;
    * Monsters have no skill use time because of the random nature in
    * which use_monster_skill is called already simulates this.
    * If certain skills should take more/less time, that should be
    * in the code for the skill itself.
    */
   if (op->type == PLAYER)
     op->speed_left -= 1.f;
   /* this is a good place to add experience for successfull use of skills.
    * Note that add_exp() will figure out player/monster experience
    * If an object is not alive and magical we set the base exp higher to
    * help out exp awards for skill_ident skills. Also, if
    * an item is type RUNE, we give out exp based on stats.Cha
    * and level (this was the old system) -b.t.
    */
   if (!op)
     {                           /* no item/creature */
-      op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty;
+      op_lvl = max (1, who->map->difficulty);
       op_exp = 0;
     }
   else if (op->type == RUNE || op->type == TRAP)
     {                           /* all traps. If stats.Cha > 1 we use that
                                  * for the amount of experience */
   else
     {                           /* all other items/living creatures */
       op_exp = op->stats.exp;
       op_lvl = op->level;
       if (!QUERY_FLAG (op, FLAG_ALIVE))
-        {                       /* for ident/make items */
+        op_lvl += 5 * abs (op->magic); /* for ident/make items */
-          op_lvl += 5 * abs (op->magic);
-        }
     }
   if (op_lvl < 1)
     op_lvl = 1;
             }
         }
       else
         {
           /* Don't divide by zero here! */
-          lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1);
+          lvl_mult = (float) op_lvl / (float) max (1, skill->level);
         }
     }
   /* assemble the exp total, and return value */
  */
 //TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
 void
 show_skills (object *op, const char *search)
 {
-  object *tmp = NULL;
-  char buf[MAX_BUF];
   const char *cp;
   int i, num_skills_found = 0;
-  static const char *const periods = "........................................";
+  const char *const periods = ".............................."; // 30
   /* Need to have a pointer and use strdup for qsort to work properly */
-  char skills[NUM_SKILLS][MAX_BUF];
+  char skills[NUM_SKILLS][128]; // d'oh
-  for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
     {
       if (tmp->type == SKILL)
         {
-          if (search && strstr (tmp->name, search) == NULL)
+          if (search && !strstr (tmp->name, search))
             continue;
+          char buf[30];
-          /* Basically want to fill this out to 40 spaces with periods */
+          /* Basically want to fill this out to 30 spaces with periods */
-          sprintf (buf, "%s%s", &tmp->name, periods);
+          snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
-          buf[40] = 0;
           if (settings.permanent_exp_ratio)
-            sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
+            snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
-                     buf, tmp->level, tmp->stats.exp,
+                      buf, tmp->level, tmp->stats.exp,
-                     level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
+                      level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
           else
-            sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
+            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));
+                      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
               break;
             }
         }
     }
-  new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
+  dynbuf_text msg (4096, 1024);
+  msg << "T<Player skills:>\n\n";
   if (num_skills_found > 1)
-    qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp);
+    qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
   for (i = 0; i < num_skills_found; i++)
-    new_draw_info (NDI_UNIQUE, 0, op, skills[i]);
+    msg << " C<" << skills [i] << ">\n";
-  new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5);
+  msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
   cp = determine_god (op);
-  new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time");
+  msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
-  new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n",
+  msg << "Your equipped item power is " << (int)op->contr->item_power
-                        op->contr->item_power, (int) (op->level * settings.item_power_factor));
+      << " out of " << int (op->level * settings.item_power_factor)
+      << "\n";
+  op->contr->infobox (MSG_CHANNEL ("skills"), msg);
 }
 /* use_skill() - similar to invoke command, it executes the skill in the
  * direction that the user is facing. Returns false if we are unable to
  * change to the requested skill, or were unable to use the skill properly.
    * the caller should have set it appropriately).  We still want to pass
    * through that code if skill is set to change to the skill.
    */
   if (player *pl = op->contr)
     {
-      if (!pl->combat_ob)
+      if (skill)
+        op->change_skill (skill);
+      else
         {
-          if (QUERY_FLAG (op, FLAG_READY_WEAPON))
-            {
-              for (tmp = op->inv; tmp; tmp = tmp->below)
-                if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
-                  break;
-              if (!tmp)
-                LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
-              pl->combat_ob = tmp;
-            }
           if (!pl->combat_ob)
             {
+              if (QUERY_FLAG (op, FLAG_READY_WEAPON))
+                {
+                  for (tmp = op->inv; tmp; tmp = tmp->below)
+                    if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
+                      break;
-              if (!skill)
+                  if (!tmp)
+                    LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
+                  pl->combat_ob = tmp;
+                }
+              if (!pl->combat_ob)
                 {
                   /* See if the players chosen skill is a combat skill, and use
                    * it if appropriate.
                    */
                   if (op->chosen_skill && hth_skill_p (op->chosen_skill))
                       skill = find_player_hth_skill (op);
                       if (!skill)
                         new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
                     }
+                  if (skill)
+                    {
+                      op->change_skill (0);
+                      apply_special (op, skill, AP_APPLY);
+                    }
                 }
-              if (skill)
+              if (!pl->combat_ob)
                 {
-                  op->change_skill (0);
+                  LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
-                  apply_special (op, skill, AP_APPLY);
+                  return 0;
                 }
             }
-          if (!pl->combat_ob)
+          if (!op->change_weapon (pl->combat_ob))
-            {
-              LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
-              return 0;
+            return 0;
-            }
         }
-      if (!op->change_weapon (pl->combat_ob))
-        return 0;
       /* lose invisiblity/hiding status for running attacks */
       if (pl->tmp_invis)
         {
           pl->tmp_invis = 0;
   return success;
 }
 /* skill_attack() - Core routine for use when we attack using a skills
  * system. In essence, this code handles
- * all skill-based attacks, ie hth, missile and melee weapons should be
+ * all skill-based attacks, i.e. hth, missile and melee weapons should be
  * treated here. If an opponent is already supplied by move_player(),
  * we move right onto do_skill_attack(), otherwise we find if an
  * appropriate opponent exists.
  *
  * This is called by move_player() and attack_hth()

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC vs. Revision 1.64 by root, Mon Sep 22 01:33:10 2008 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC vs.
Revision 1.64 by root, Mon Sep 22 01:33:10 2008 UTC