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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.71 by root, Wed Dec 27 09:28:02 2006 UTC vs.
Revision 1.72 by root, Wed Dec 27 15:04:39 2006 UTC

   add_friendly_object (ob);
   LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
   new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
-  new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
   esrv_new_player (this, ob->weight + ob->carrying);
   ob->update_stats ();
   ns->floorbox_update ();
 void
 player::disconnect ()
 {
   //TODO: don't be so harsh and destroy :)
   if (ns)
+    {
+      if (enable_save)
+        INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
+      client *ns = this->ns;
+      ns->send_packet ("goodbye");
+      ns->flush ();
+      ns->pl = 0;
+      this->ns = 0;
+      ns->destroy ();
-    destroy ();
+      destroy ();
+    }
 }
 // the need for this function can be explained
 // by load_object not returning the object
 void
 }
 void
 player::do_destroy ()
 {
-  attachable::do_destroy ();
+  disconnect ();
   save (false);
   enable_save = false;
-  disconnect ();
+  attachable::do_destroy ();
   terminate_all_pets (ob);
   if (first_player != this)
     {
   if (ob)
     {
       ob->destroy_inv (false);
       ob->destroy ();
-    }
-  if (ns)
-    {
-      client *ns = this->ns;
-      ns->send_packet ("goodbye");
-      ns->flush ();
-      ns->pl = 0;
-      this->ns = 0;
-      ns->destroy ();
     }
 }
 player::~player ()
 {

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