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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.61 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.62 by root, Mon Dec 25 11:25:49 2006 UTC

   send_rules (ob);
   send_news (ob);
   display_motd (ob);
   INVOKE_PLAYER (LOGIN, this);
+}
+void
+player::disconnect ()
+{
+  if (!ns)
+    return;
+  //TODO: don't be so harsh and destroy :)
+  destroy ();
+  ns->pl = 0;
+  ns = 0;
 }
 // the need for this function can be explained
 // by load_object not returning the object
 void
   last_stats.exp = -1;
   last_weight = (uint32) - 1;
 }
-player::~player ()
+void
+player::do_destroy ()
 {
+  attachable::do_destroy ();
+  disconnect ();
   terminate_all_pets (ob);
   if (first_player != this)
     {
       player *prev = first_player;
     }
   else
     first_player = next;
   if (ob)
-    {
-      ob->contr = 0;
-      ob->destroy (1);
+    ob->destroy (true);
-    }
   if (ns)
     {
       ns->send_packet ("goodbye");
       ns->flush ();
       ns->pl = 0;
       ns->destroy ();
     }
+  attachable::do_destroy ();
+}
+player::~player ()
+{
   /* Clear item stack */
   free (stack_items);
 }
 /* Tries to add player on the connection passed in ns.

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