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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.204 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC

   /* make sure he's a player -- needed because of class change. */
   ob->type = PLAYER; // we are paranoid
   ob->race = ob->arch->race;
   ob->update_weight ();
-  link_player_skills (ob);
+  link_skills ();
   CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
   assign (title, ob->arch->object::name);
   attachable::do_destroy ();
   if (ob)
     {
       ob->destroy_inv (false);
-      ob->destroy ();
+      ob->destroy (true);
     }
   ob = observe = 0;
 }
                 || op->type == CLOAK   || op->type == HELMET
                 || op->type == SHIELD  || op->type == GLOVES
                 || op->type == BRACERS || op->type == GIRDLE))
               || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
             {
-              op->destroy ();
+              op->destroy (true);
               continue;
             }
         }
       /* This really needs to be better - we should really give
             if (tmp->type == op->type && tmp->name == op->name)
               break;
           if (tmp)
             {
-              op->destroy ();
+              op->destroy (true);
               LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
               continue;
             }
           if (op->nrof > 1)
           CLEAR_FLAG (op, FLAG_DAMNED);
         }
       if (op->type == SPELL)
         {
-          op->destroy ();
+          op->destroy (true);
           continue;
         }
       else if (op->type == SKILL)
         {
           SET_FLAG (op, FLAG_CAN_USE_SKILL);
       else /* lock all 'normal items by default */
         SET_FLAG (op, FLAG_INV_LOCKED);
     }                           /* for loop of objects in player inv */
   /* Need to set up the skill pointers */
-  link_player_skills (pl);
+  pl->contr->link_skills ();
 }
 void
 get_party_password (object *op, partylist *party)
 {
     ob->msg = 0;
   start_info (ob);
   CLEAR_FLAG (ob, FLAG_WIZ);
   give_initial_items (ob, ob->randomitems);
-  link_player_skills (ob);
   esrv_send_inventory (ob, ob);
   ob->update_stats ();
   /* This moves the player to a different start map, if there
    * is one for this race
     }
   /* this should not happen, but sometimes does */
   if (arrow->nrof == 0)
     {
+      LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
-      arrow->destroy ();
+      arrow->destroy (true);
       return 0;
     }
   left = arrow;                 /* these are arrows left to the player */
   arrow = arrow->split ();
     if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
       {
         op->play_sound (sound_find ("ob_evaporate"));
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
-        tmp->destroy ();
+        tmp->destroy (true);
         CLEAR_FLAG (op, FLAG_LIFESAVE);
         if (op->stats.hp < 0)
           op->stats.hp = op->stats.maxhp;
           op->stats.food = 0;
           if (op->stats.hp < 0)
             {
               op->contr->killer = archetype::get ("killer_starvation");
-              op->contr->killer->destroy ();
+              op->contr->killer->destroy (true);
             }
         }
       /* killer should be set here already */
       if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
       /* restore player */
       at = archetype::find ("poisoning");
       if (object *tmp = present_arch_in_ob (at, op))
         {
-          tmp->destroy ();
+          tmp->destroy (true);
           new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
         }
       at = archetype::find ("confusion");
       if (object *tmp = present_arch_in_ob (at, op))
         {
-          tmp->destroy ();
+          tmp->destroy (true);
           new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
         }
       cure_disease (op, 0, 0);     /* remove any disease */
       op->stats.hp = op->stats.maxhp;
   at = archetype::find ("poisoning");
   tmp = present_arch_in_ob (at, op);
   if (tmp)
     {
-      tmp->destroy ();
+      tmp->destroy (true);
       new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
     }
   at = archetype::find ("confusion");
   tmp = present_arch_in_ob (at, op);
   if (tmp)
     {
-      tmp->destroy ();
+      tmp->destroy (true);
       new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
     }
   cure_disease (op, 0, 0);     /* remove any disease */
   for (object *item = op->inv; item; )
     {
       object *next = item->below;
       if (item->type == SPELL_EFFECT && item->active)
-        item->destroy ();
+        item->destroy (true);
       item = next;
     }
   /*add_exp(op, (op->stats.exp * -0.20)); */
             {
               tmp->decrease (rndm (1, tmp->nrof - 1));
               insert_ob_in_map (tmp, op->map, NULL, 0);
             }
           else
-            tmp->destroy ();
+            tmp->destroy (true);
         }
       else
         insert_ob_in_map (tmp, op->map, NULL, 0);
     }
 }
   if (op->type == PLAYER)
     new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
   cast_spell (op, throw_ob, dir, spob, NULL);
-  throw_ob->destroy ();
+  throw_ob->destroy (true);
 }
 void
 make_visible (object *op)
 {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.204 by root, Fri Sep 19 01:39:45 2008 UTC vs. Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.204 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC