--- deliantra/server/include/object.h	2007/01/20 22:09:52	1.90
+++ deliantra/server/include/object.h	2007/04/16 13:02:29	1.107
@@ -112,6 +112,7 @@
 				/* To get put into books and the like. */
   shstr ACC (RW, materialname);	/* specific material name */
   shstr ACC (RW, custom_name);	/* Custom name assigned by player */
+//  materialtype_t *ACC (RW, material);	/* What material this object consists of */
   object_ptr ACC (RW, owner);	/* Pointer to the object which controls this one */
   object_ptr ACC (RW, enemy);	/* Monster/player to follow even if not closest */
   object_ptr ACC (RW, attacked_by);	/* This object start to attack us! only player & monster */
@@ -122,7 +123,6 @@
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
 
-  facetile *ACC (RW, face);	/* Face with colors */
   float ACC (RW, speed);	/* The overall speed of this object */
   float ACC (RW, speed_left);	/* How much speed is left to spend this round */
   uint32 ACC (RW, nrof);	/* How many of the objects */
@@ -136,7 +136,7 @@
   uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
   uint32 ACC (RW, path_repelled);	/* Paths the object is repelled from */
   uint32 ACC (RW, path_denied);	/* Paths the object is denied access to */
-  uint16 ACC (RW, material);	/* What materials this object consist of */
+  uint16 ACC (RW, materials);	/* What materials this object consists of */
   sint8 ACC (RW, magic);	/* Any magical bonuses to this item */
   uint8 ACC (RW, state);	/* How the object was last drawn (animation) */
   sint32 ACC (RW, value);	/* How much money it is worth (or contains) */
@@ -161,6 +161,7 @@
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
   sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]);	/* body info as loaded from the file */
   sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]);	/* Calculated value based on items equipped */
+  faceidx ACC (RW, face);	/* Face with colors */
   living ACC (RO, stats);	/* Str, Con, Dex, etc */
   /* See the pod/objects.pod for more info about body locations */
 
@@ -199,7 +200,6 @@
   /* Following are values used by any object */
   /* 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. */
   flags_t flag;                 /* various flags */
 #if FOR_PERL
   bool ACC (RW, flag[NUM_FLAGS]);
@@ -230,7 +230,7 @@
   object *inv;			/* Pointer to the first object in the inventory */
 
   //TODO: container must move into client
-  object *ACC (RW, container);	/* Current container being used.  I think this
+  object_ptr 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.
@@ -239,8 +239,14 @@
   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
   client_container *seen_by;    // seen by which player/container currently?
+  key_value *key_values;	/* Fields not explictly known by the loader. */
+
+  bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
+  static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
+  bool write (object_freezer &f);
 
   MTH static object *create ();
+  object &operator =(const object &src);
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
   void do_destroy ();
@@ -250,11 +256,11 @@
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
   MTH object *insert (object *item); // insert into inventory
-  void remove_slow ();
+  void do_remove ();
   MTH void remove ()
   {
     if (!flag [FLAG_REMOVED])
-      remove_slow ();
+      do_remove ();
   }
 
   static bool can_merge_slow (object *op1, object *op2);
@@ -270,14 +276,14 @@
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
 
-  MTH void instantiate ()
+  MTH void open_container (object *new_container);
+  MTH void close_container ()
   {
-    if (!uuid.seq) // HACK
-      uuid = gen_uuid ();
-
-    attachable::instantiate ();
+    open_container (0);
   }
 
+  MTH void instantiate ();
+
   // recalculate all stats
   MTH void update_stats ();
   MTH void roll_stats ();
@@ -294,6 +300,28 @@
   const char *debug_desc2 () const; // another debug_desc, pure convinience function
   const char *flag_desc (char *desc, int len) const;
 
+  int number_of () const
+  {
+    return nrof ? nrof : 1;
+  }
+
+  uint64 total_weight () const
+  {
+    return weight * number_of ();
+  }
+
+  // return the dominant material of this item, always return something
+  const materialtype_t *dominant_material () const;
+
+  // return the volume of this object in cm³
+  uint64 volume () const
+  {
+    return total_weight ()
+           * 1000
+           * (type == CONTAINER ? 1000 : 1)
+           / dominant_material ()->density;
+  }
+
   MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
   MTH bool is_armor  () const { return type == ARMOUR  || type == SHIELD || type == HELMET
                                     || type == CLOAK   || type == BOOTS  || type == GLOVES
@@ -401,6 +429,8 @@
     return !invisible && type != PLAYER;
   }
 
+  MTH struct region *region () const;
+
 protected:
   friend struct archetype;
 
@@ -418,11 +448,11 @@
 extern activevec actives;
 
 #define for_all_objects(var)			\
-  for (int _i = 0; _i < objects.size (); ++_i)	\
+  for (unsigned _i = 0; _i < objects.size (); ++_i)	\
     declvar (object *, var, objects [_i])
 
 #define for_all_actives(var)			\
-  for (int _i = 0; _i < actives.size (); ++_i)	\
+  for (unsigned _i = 0; _i < actives.size (); ++_i)	\
     declvar (object *, var, actives [_i])
 
 typedef struct oblnk
@@ -454,7 +484,9 @@
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  static archetype *find (const char *arch);
+  static bool load (object_thawer &f);
+  static archetype *get (const char *name); // find or create
+  static archetype *find (const char *name);
 
   void hash_add (); // add to hashtable
   void hash_del (); // remove from hashtable
@@ -465,6 +497,7 @@
   struct archetype *ACC (RW, more);    		/* Next part of a linked object */
   object ACC (RO, clone);	       		/* An object from which to do ->copy_to () */
   uint32 ACC (RW, editable);	       		/* editable flags (mainly for editor) */
+  bool ACC (RW, linked);                        // linked into list of heads
   sint8 ACC (RW, tail_x), ACC (RW, tail_y);	/* Where the lower right most portion of the object is
 						 * in comparison to the head.
 						 */