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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.31 by root, Sun Apr 29 18:11:21 2007 UTC vs.
Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC

  * flag has the current meaning:
  * 0x1: If set, don't update the range pointer.  This is useful when we
  *   need to ready a new skill, but don't want to clobber range.
  * return 1 on success, 0 on error
  */
 int
 change_skill (object *who, object *new_skill, int flag)
 {
   int old_range;
   old_range = who->contr->shoottype;
   if (who->chosen_skill && who->chosen_skill == new_skill)
     {
       /* optimization for changing skill to current skill */
-      if (who->type == PLAYER && !(flag & 0x1))
+      if (!(flag & 0x1))
-        who->contr->shoottype = range_skill;
+        who->contr->set_range (range_skill);
       return 1;
     }
   // move skill to front, so it will be preferred next time
   new_skill->remove ();
   who->insert (new_skill);
-  if (!new_skill || who->chosen_skill)
-    if (who->chosen_skill)
-      apply_special (who, who->chosen_skill, AP_UNAPPLY);
-  /* Only goal in this case was to unapply a 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;
+      return 0;
+    }
   if (apply_special (who, new_skill, AP_APPLY))
     return 0;
-  if (flag & 0x1)
+  if (!(flag & 0x1))
-    who->contr->shoottype = (rangetype)old_range;
+    who->contr->set_range ((rangetype) old_range);
   return 1;
 }
 /* This function just clears the chosen_skill and range_skill values

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