--- deliantra/server/include/player.h	2006/12/22 16:34:00	1.31
+++ deliantra/server/include/player.h	2006/12/25 11:25:49	1.35
@@ -108,21 +108,23 @@
   uint32 kills;
 };
 
-ACC_CLASS (player)
+#define for_all_players(var) for (player *var = first_player; var; var = var->next)
 
-// memsettable part of player
-struct player_pod
+INTERFACE_CLASS (player)
+struct player : zero_initialised, attachable
 {
+  player *ACC (RW, next);              /* Pointer to next player, NULL if this is last */
+  client_ptr ACC (RO, ns);             /* Socket information for this player */
   object_ptr ACC (RW, ob);            /* The object representing the player */
   maptile *loading;             /* When entering a map in progress of loading, not really used */
-  rangetype shoottype;          /* Which range-attack is being used by player */
-  bowtype_t bowtype;            /* which firemode? */
-  petmode_t petmode;            /* which petmode? */
-  object_ptr ranges[range_size];   /* object for each range.  Set up in fix player.  Note */
+  rangetype ACC (RW, shoottype);          /* Which range-attack is being used by player */
+  bowtype_t ACC (RW, bowtype);            /* which firemode? */
+  petmode_t ACC (RW, petmode);            /* which petmode? */
+  object_ptr ACC (RW, ranges[range_size]);   /* object for each range.  Set up in fix player.  Note */
                                    /* That not all are used, it is just nice to map this 1:1 */
                                    /* With the range names */
-  usekeytype usekeys;           /* Method for finding keys for doors */
-  unapplymode unapply;          /* Method for auto unapply */
+  usekeytype ACC (RW, usekeys);           /* Method for finding keys for doors */
+  unapplymode ACC (RW, unapply);          /* Method for auto unapply */
   uint32 ACC (RW, count);                 /* Any numbers typed before a command */
   uint32 ACC (RW, mode);                  /* Mode of player for pickup. */
 
@@ -142,7 +144,6 @@
   uint32 ACC (RO, fire_on):1;             /* Player should fire object, not move */
   uint32 ACC (RO, run_on):1;              /* Player should keep moving in dir until run is off */
   uint32 ACC (RO, has_hit):1;             /* If set, weapon_sp instead of speed will count */
-  uint32 ACC (RO, name_changed):1;        /* If true, the player has set a name. */
   uint32 ACC (RO, peaceful):1;            /* If set, won't attack friendly creatures */
   uint32 ACC (RO, hidden):1;              /* If True, player (DM) is hidden from view */
   uint32 ACC (RO, explore):1;             /* if True, player is in explore mode */
@@ -161,7 +162,7 @@
   living ACC (RO, orig_stats);            /* Permanent real stats of player */
   living ACC (RO, last_stats);            /* Last stats as sent to client */
   float ACC (RW, last_speed);             /* Last speed as sent to client */
-  sint16 last_resist[NROFATTACKS];      /* last resist values sent to client */
+  sint16 ACC (RW, last_resist[NROFATTACKS]);      /* last resist values sent to client */
   object_ptr ACC (RW, last_used);            /* Pointer to object last picked or applied */
 
   sint16 ACC (RW, bed_x), ACC (RW, bed_y);          /* x,y - coordinates of respawn (savebed) */
@@ -173,9 +174,9 @@
   /* Note that for dragon players, this is filled in for them */
   char ACC (RW, title)[64];         /* Default title, like fighter, wizard, etc */
 
-  sint8 levhp[11];              /* What the player gained on that level */
-  sint8 levsp[11];              /* Same for sp */
-  sint8 levgrace[11];           /* And same for grace */
+  sint8 ACC (RW, levhp[11]);              /* What the player gained on that level */
+  sint8 ACC (RW, levsp[11]);              /* Same for sp */
+  sint8 ACC (RW, levgrace[11]);           /* And same for grace */
 
   char ACC (RW, killer)[64];        /* Who killed this player. */
 
@@ -198,33 +199,21 @@
   tag_t *stack_items;           /* Item stack for patch/dump/... commands */
   int ACC (RW, stack_position);           /* Current stack position, 0 for no item */
   sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y];        /* array showing what spaces */
-  /* the player can see.  For maps smaller than */
-  /* MAP_CLIENT_.., the upper left is used */
-};
+                                                        /* the player can see.  For maps smaller than */
+                                                        /* MAP_CLIENT_.., the upper left is used */
 
-struct player : zero_initialised, attachable<player>, player_pod
-{
-  player *ACC (RW, next);              /* Pointer to next player, NULL if this is last */
-  client *ACC (RO, ns);             /* Socket information for this player */
   shstr ACC (RW, invis_race);             /* What race invisible to? */
   bool ACC (RW, enable_save);
   Output_Buf outputs[NUM_OUTPUT_BUFS];  /* holds output strings to client */
 
-  void clear ()
-  {
-    memset (static_cast < player_pod * >(this), 0, sizeof (player_pod));
-    attachable_clear ();
-    invis_race = 0;
-
-    for (int i = 0; i < NUM_OUTPUT_BUFS; i++)
-      outputs[i].buf = 0;
-  }
-
   static player *create ();
   static player *load (const char *path);
   void save (bool final = false);
+  void do_destroy ();
+  void gather_callbacks (AV *&callbacks, event_type event) const;
 
   void connect (client *ns);
+  void disconnect ();
 
   ~player ();