[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC

   new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
   esrv_new_player (this, ob->weight + ob->carrying);
+  ob->flag [FLAG_READY_WEAPON] = false;
+  ob->flag [FLAG_READY_SKILL]  = false;
+  ob->flag [FLAG_READY_BOW]    = false;
   for (object *op = ob->inv; op; op = op->below)
     if (op->flag [FLAG_APPLIED])
       switch (op->type)
         {
           case WAND:
           case ROD:
           case HORN:
           case BOW:
-          case SKILL:
           case SKILL_TOOL:
           case WEAPON:
-            apply_special (ob, op, AP_UNAPPLY);
+            op->flag [FLAG_APPLIED] = false;
             apply_special (ob, op, AP_APPLY);
             break;
-        }
+          case SKILL:
+            op->flag [FLAG_APPLIED] = false;
+            break;
+        }
+  ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
   ob->update_stats ();
   ns->floorbox_update ();
   esrv_send_inventory (ob, ob);
   esrv_add_spells (this, 0);
   activate ();

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