--- deliantra/server/common/player.C	2006/08/13 17:16:00	1.1
+++ deliantra/server/common/player.C	2006/12/14 04:30:32	1.9
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_player_c =
- *   "$Id: player.C,v 1.1 2006/08/13 17:16:00 elmex Exp $";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -23,35 +18,47 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #include <global.h>
 #include <funcpoint.h>
 
-void free_player(player *pl) {
+void
+free_player (player *pl)
+{
+  if (first_player != pl)
+    {
+      player *prev = first_player;
+
+      while (prev != NULL && prev->next != NULL && prev->next != pl)
+        prev = prev->next;
+
+      if (prev->next != pl)
+        {
+          LOG (llevError, "Free_player: Can't find previous player.\n");
+          exit (1);
+        }
 
-    if (first_player!=pl) {
-	player *prev=first_player;
-	while(prev!=NULL&&prev->next!=NULL&&prev->next!=pl)
-	    prev=prev->next;
-	if(prev->next!=pl) {
-	    LOG(llevError,"Free_player: Can't find previous player.\n");
-	    exit(1);
-	}
-	prev->next=pl->next;
-    } else first_player=pl->next;
-
-    if(pl->ob != NULL) {
-	if (!QUERY_FLAG(pl->ob, FLAG_REMOVED)) remove_ob(pl->ob);
-	free_object(pl->ob);
+      prev->next = pl->next;
     }
-    /* Clear item stack */
-    if (pl->stack_items) free( pl->stack_items );
+  else
+    first_player = pl->next;
+
+  if (pl->ob)
+    {
+      pl->ob->contr = 0;
+      pl->ob->destroy ();
+    }
+
+  /* Clear item stack */
+  if (pl->stack_items)
+    free (pl->stack_items);
 
-    free(pl->socket.faces_sent);
+  pl->socket->status = Ns_Dead;
+  pl->socket->pl = 0;
 
-    CFREE(pl);
+  delete pl;
 }
 
 
@@ -60,10 +67,11 @@
  * A dragon player (quetzal) can gain resistances for
  * all enabled attacktypes.
  */
-int atnr_is_dragon_enabled(int attacknr) {
+int
+atnr_is_dragon_enabled (int attacknr)
+{
   if (attacknr == ATNR_MAGIC || attacknr == ATNR_FIRE ||
-      attacknr == ATNR_ELECTRICITY || attacknr == ATNR_COLD ||
-      attacknr == ATNR_ACID || attacknr == ATNR_POISON)
+      attacknr == ATNR_ELECTRICITY || attacknr == ATNR_COLD || attacknr == ATNR_ACID || attacknr == ATNR_POISON)
     return 1;
   return 0;
 }
@@ -72,10 +80,10 @@
  * returns true if the adressed object 'ob' is a player
  * of the dragon race.
  */
-int is_dragon_pl(const object* op) {
-  if (op != NULL && op->type == PLAYER && op->arch != NULL
-      && op->arch->clone.race != NULL &&
-      strcmp(op->arch->clone.race, "dragon")==0)
+int
+is_dragon_pl (const object *op)
+{
+  if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0)
     return 1;
   return 0;
 }