--- deliantra/server/include/object.h	2006/12/20 09:14:22	1.60
+++ deliantra/server/include/object.h	2006/12/23 06:21:02	1.64
@@ -90,9 +90,6 @@
  * e.g. ->copy_to ()
  */
 
-typedef refptr<object> object_ptr;
-typedef refptr<archetype> arch_ptr;
-
 // these are not being copied
 ACC_CLASS (object)
 struct object_keep : refcounted
@@ -102,7 +99,7 @@
   tag_t ACC (RW, count);	/* Generation count for this object */
   UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
 
-  player *ACC (RW, contr);	/* Pointer to the player which control this object */
+  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' */
@@ -147,11 +144,15 @@
   object_ptr ACC (RW, spellitem);	/* Spell ability monster is choosing to use */
   object_ptr ACC (RW, spell);	/* Spell that was being cast */
   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 */
   float ACC (RW, speed);	/* The overall speed of this object */
@@ -223,10 +224,8 @@
   /* Following are values used by any object */
   /* this objects turns into or what this object creates */
   treasurelist *ACC (RW, randomitems);	/* Items to be generated */
-  arch_ptr ACC (RW, arch);	/* Pointer to archetype */
-  arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
   key_value *key_values;	/* Fields not explictly known by the loader. */
-  std::bitset<NUM_FLAGS> flags; /* various flags */
+  object_pod::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 */
@@ -245,6 +244,7 @@
 
 struct object : zero_initialised, object_keep, object_copy, object_pod
 {
+  typedef object_pod::flags_t flags_t;
   typedef unordered_vector<object *> vector;
 
   static vector mortals;
@@ -270,8 +270,6 @@
         && can_merge_slow (op1, op2);
   }
 
-  void clear ();
-
   bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
 
   void set_owner (object *owner);
@@ -284,6 +282,16 @@
     attachable<object>::instantiate ();
   }
 
+  // recalculate all stats
+  void update_stats ();
+  void roll_stats ();
+  void swap_stats (int a, int b);
+  void add_statbonus ();
+  void remove_statbonus ();
+  void drain_stat ();
+  void drain_specific_stat (int deplete_stats);
+  void change_luck (int value);
+
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
   const char *debug_desc () const;
@@ -315,6 +323,9 @@
     return 0;
   }
 
+  // returns the mapspace this object is in
+  mapspace &ms () const;
+
   // fully recursive iterator
   struct iterator_base
   {