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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.39 by root, Wed May 9 11:32:31 2007 UTC vs.
Revision 1.40 by root, Fri May 11 20:06:33 2007 UTC

 }
 /* This changes the objects skill to new_skill.
  * note that this function doesn't always need to get used -
  * you can now add skill exp to the player without the chosen_skill being
- * set.  This function is of most interest to players to update
+ * set. This function is of most interest to players to update
  * the various range information.
  * return 1 on success, 0 on error
  */
 int
 change_skill (object *who, object *new_skill, int flag)
 {
   if (who->type != PLAYER)
     return 0;
+  // optimise this supposedly common case
+  if (new_skill == who->chosen_skill)
+    return 1;
+  fprintf (stderr, "cs from %s to %s\n", who->chosen_skill ? &who->chosen_skill->name : 0,
+           new_skill ? &new_skill->name : 0);//D//D//D
+  if (who->chosen_skill)
+    apply_special (who, who->chosen_skill, AP_UNAPPLY);
   if (!new_skill)
     {
       LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n",
            who->debug_desc ());
       return 0;
     }
   player *pl = who->contr;
-  // move skill to front, so it will be preferred next time
+  // move skill to front, so it will be prefered next time
   new_skill->remove ();
   who->insert (new_skill);
   if (apply_special (who, new_skill, AP_APPLY))
     return 0;

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