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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.46 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.47 by root, Sun May 13 19:56:57 2007 UTC

  * this replaces find_skill.
  */
 object *
 find_skill_by_number (object *who, int skillno)
 {
+  if (!IN_RANGE_EXC (skillno, 1, NUM_SKILLS))
+    return 0;
-  object *skill = NULL, *skill_tool = NULL, *tmp;
+  object *skill = NULL, *skill_tool = NULL;
-  if (skillno < 1 || skillno >= NUM_SKILLS)
-    return NULL;
-  for (tmp = who->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = who->inv; tmp; tmp = tmp->below)
     {
       if (tmp->type == SKILL && tmp->subtype == skillno)
         skill = tmp;
       /* Try to find appropriate skilltool.  If the player has one already
             skill_tool = tmp;
           else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
             skill_tool = tmp;
         }
     }
   /* If this is a skill that can be used without a tool, return it */
   if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
     return skill;
-  /* Player has a tool to use the skill.  IF not applied, apply it -
+  /* 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
+   * if not successful, return null. If they do have the skill tool
    * but not the skill itself, give it to them.
    */
   if (skill_tool)
     {
       if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))

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