--- deliantra/server/include/player.h	2007/01/06 14:42:30	1.42
+++ deliantra/server/include/player.h	2007/01/07 02:39:14	1.43
@@ -109,20 +109,19 @@
   uint32 ACC (RW, kills);
 };
 
-#define for_all_players(var) for (player *var = first_player; var; var = var->next)
-
 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 */
-  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? */
+  client *ACC (RO, ns);                /* Socket information for this player */
+  object *ACC (RW, ob);                /* The object representing the player */
+  int ACC (RO, active);
+
+  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 */
+                                             /* That not all are used, it is just nice to map this 1:1 */
+                                             /* With the range names */
   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 */
@@ -138,15 +137,14 @@
   sint8 ACC (RW, last_level);             /* Last level we sent to client */
 
   /* Try to put all the bitfields together - saves some small amount of memory */
-  bool ACC (RO, braced);              /* Will not move if braced, only attack */
-  bool ACC (RO, tmp_invis);           /* Will invis go away when we attack ? */
-  bool ACC (RO, do_los);              /* If true, need to call update_los() in draw(), and clear */
-  bool ACC (RO, fire_on);             /* Player should fire object, not move */
-  bool ACC (RO, run_on);              /* Player should keep moving in dir until run is off */
-  bool ACC (RO, has_hit);             /* If set, weapon_sp instead of speed will count */
-  bool ACC (RO, peaceful);            /* If set, won't attack friendly creatures */
-  bool ACC (RO, hidden);              /* If True, player (DM) is hidden from view */
-  bool ACC (RO, explore);             /* if True, player is in explore mode */
+  bool ACC (RW, braced);              /* Will not move if braced, only attack */
+  bool ACC (RW, tmp_invis);           /* Will invis go away when we attack ? */
+  bool ACC (RW, do_los);              /* If true, need to call update_los() in draw(), and clear */
+  bool ACC (RW, fire_on);             /* Player should fire object, not move */
+  bool ACC (RW, run_on);              /* Player should keep moving in dir until run is off */
+  bool ACC (RW, has_hit);             /* If set, weapon_sp instead of speed will count */
+  bool ACC (RW, peaceful);            /* If set, won't attack friendly creatures */
+  bool ACC (RW, hidden);              /* If True, player (DM) is hidden from view */
 
   object_ptr last_skill_ob[NUM_SKILLS];    /* the exp object */
   sint64 last_skill_exp[NUM_SKILLS];    /* shadow register. if != exp. obj update client */
@@ -203,18 +201,25 @@
                                                         /* MAP_CLIENT_.., the upper left is used */
 
   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 */
 
   MTH static player *create ();
-  MTH static player *load (const char *path);
-  MTH void save (bool final = false);
+
+  static player *load_pl (object_thawer &thawer);
+  MTH static player *load_pl (const char *path);
+
+  bool save_pl (object_freezer &freezer);
+  MTH bool save_pl (const char *path);
+
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
   MTH void connect (client *ns);
   MTH void disconnect ();
 
+  MTH void activate ();
+  MTH void deactivate ();
+
   // enters the initial map, after login or creation
   MTH void enter_map ();
 
@@ -225,3 +230,11 @@
   player ();
 };
 
+typedef object_vector<player, &player::active> playervec;
+
+extern playervec players;
+
+#define for_all_players(var)			\
+  for (int _i = 0; _i < players.size (); ++_i)	\
+    declvar (player *, var, players [_i])
+