--- deliantra/server/include/object.h	2006/12/23 06:21:02	1.64
+++ deliantra/server/include/object.h	2006/12/23 06:30:49	1.65
@@ -90,41 +90,12 @@
  * e.g. ->copy_to ()
  */
 
-// these are not being copied
 ACC_CLASS (object)
-struct object_keep : refcounted
-{
-  /* These variables are not changed by ->copy_to */
-
-  tag_t ACC (RW, count);	/* Generation count for this object */
-  UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
-
-  player_ptr ACC (RW, contr);	/* Pointer to the player which control this object */
-  object *ACC (RW, next);	/* Pointer to the next object in the free/used list */
-  object *ACC (RW, prev);	/* Pointer to the previous object in the free/used list */
-  object *ACC (RW, active_next);/* Next & previous object in the 'active' */
-  object *ACC (RW, active_prev);/* List.  This is used in process_events */
-                                /* so that the entire object list does not */
-                                /* need to be gone through. */
-  object *ACC (RW, below);	/* Pointer to the object stacked below this one */
-  object *ACC (RW, above);	/* Pointer to the object stacked above this one */
-                                /* Note: stacked in the *same* environment */
-  object *inv;			/* Pointer to the first object in the inventory */
-  object *ACC (RW, container);	/* Current container being used.  I think this
-				 * is only used by the player right now.
-				 */
-  object *ACC (RW, env);	/* Pointer to the object which is the environment.
-				 * This is typically the container that the object is in.
-				 */
-  object *ACC (RW, more);	/* Pointer to the rest of a large body of objects */
-  object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
-  maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
-  client_container *seen_by;    // seen by which player/container currently?
-};
-
 // these are being copied
-struct object_copy : attachable<object>
+struct object_copy
 {
+  typedef bitset<NUM_FLAGS> flags_t;
+
   shstr ACC (RW, name);		/* The name of the object, obviously... */
   shstr ACC (RW, name_pl);	/* The plural name of the object */
   shstr ACC (RW, title);	/* Of foo, etc */
@@ -146,12 +117,6 @@
   object_ptr ACC (RW, current_weapon);	/* Pointer to the weapon currently used */
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
-};
-
-// these are being copied and also cleared
-struct object_pod
-{
-  typedef bitset<NUM_FLAGS> flags_t;
 
   New_Face *ACC (RW, face);	/* Face with colors */
   sint16 ACC (RW, x), ACC (RW, y);	/* Position in the map for this object */
@@ -225,7 +190,7 @@
   /* this objects turns into or what this object creates */
   treasurelist *ACC (RW, randomitems);	/* Items to be generated */
   key_value *key_values;	/* Fields not explictly known by the loader. */
-  object_pod::flags_t flags;        /* various flags */
+  flags_t flags;        /* various flags */
   uint16 ACC (RW, animation_id);/* An index into the animation array */
   uint8 ACC (RW, anim_speed);	/* ticks between animation-frames */
   uint8 ACC (RW, last_anim);	/* last sequence used to draw face */
@@ -242,11 +207,37 @@
   float ACC (RW, move_slow_penalty);	/* How much this slows down the object */
 };
 
-struct object : zero_initialised, object_keep, object_copy, object_pod
+struct object : zero_initialised, refcounted, attachable<object>, object_copy
 {
-  typedef object_pod::flags_t flags_t;
   typedef unordered_vector<object *> vector;
 
+  // These variables are not changed by ->copy_to
+
+  tag_t ACC (RW, count);	/* Generation count for this object */
+  UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
+
+  player_ptr ACC (RW, contr);	/* Pointer to the player which control this object */
+  object *ACC (RW, next);	/* Pointer to the next object in the free/used list */
+  object *ACC (RW, prev);	/* Pointer to the previous object in the free/used list */
+  object *ACC (RW, active_next);/* Next & previous object in the 'active' */
+  object *ACC (RW, active_prev);/* List.  This is used in process_events */
+                                /* so that the entire object list does not */
+                                /* need to be gone through. */
+  object *ACC (RW, below);	/* Pointer to the object stacked below this one */
+  object *ACC (RW, above);	/* Pointer to the object stacked above this one */
+                                /* Note: stacked in the *same* environment */
+  object *inv;			/* Pointer to the first object in the inventory */
+  object *ACC (RW, container);	/* Current container being used.  I think this
+				 * is only used by the player right now.
+				 */
+  object *ACC (RW, env);	/* Pointer to the object which is the environment.
+				 * This is typically the container that the object is in.
+				 */
+  object *ACC (RW, more);	/* Pointer to the rest of a large body of objects */
+  object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
+  maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
+  client_container *seen_by;    // seen by which player/container currently?
+
   static vector mortals;
   static vector active;  // active objects, not yet used
   static vector objects; // not used yet, use first->next->...