--- deliantra/server/include/object.h	2008/04/20 00:44:12	1.160
+++ deliantra/server/include/object.h	2008/05/04 08:25:33	1.173
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -76,11 +76,11 @@
  *
  * key and value are shared-strings.
  *
- * Please use get_ob_key_value(), set_ob_key_value() from object.c rather than
+ * Please use kv_get/kv_set/kv_del from object rather than
  * accessing the list directly.
  * Exception is if you want to walk this list for some reason.
  */
-struct key_value
+struct key_value : slice_allocated
 {
   key_value *next;
   shstr key, value;
@@ -179,7 +179,7 @@
   float ACC (RW, speed_left);	/* How much speed is left to spend this round */
   uint32 ACC (RW, nrof);	/* How many of the objects */
 
-  /* This next big block are basically used for monsters and equipment */
+  /* This next big block is basically used for monsters and equipment */
   uint16 ACC (RW, client_type);	/* Public type information.  see doc/Developers/objects */
 
   sint16 ACC (RW, resist[NROFATTACKS]);	/* Resistance adjustments for attacks */
@@ -206,7 +206,7 @@
   sint8 ACC (RW, glow_radius);	/* indicates the glow radius of the object */
   sint32 ACC (RW, weight);	/* Attributes of the object */
   sint32 ACC (RW, weight_limit);/* Weight-limit of object */
-  sint32 ACC (RW, carrying);	/* How much weight this object contains */
+  sint32 ACC (RW, carrying);	/* How much weight this object contains, must be 0 if nrof == 0 */
   sint64 ACC (RW, perm_exp);	/* Permanent exp */
   uint32 ACC (RW, weapontype);	/* type of weapon */
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
@@ -296,6 +296,41 @@
   client_container *seen_by;    // seen by which player/container currently?
   key_value *key_values;	/* Fields not explictly known by the loader. */
 
+  // privates / perl
+  const shstr &kv_get (const shstr &key) const;
+  void kv_del (const shstr &key);
+  void kv_set (const shstr &key, const shstr &value);
+
+  // custom extra fields management
+  struct key_value_access_proxy
+  {
+    object &ob;
+    shstr key;
+
+    key_value_access_proxy (object &ob, const shstr &key)
+    : ob (ob), key (key)
+    {
+    }
+
+    const key_value_access_proxy &operator =(const shstr &value) const
+    {
+      ob.kv_set (key, value);
+      return *this;
+    }
+
+    operator const shstr &() const { return ob.kv_get (key); }
+    operator const char  *() const { return ob.kv_get (key); }
+
+  private:
+    void operator =(int);
+  };
+
+  // operator [] is too annoying to use
+  const key_value_access_proxy kv (const shstr &key)
+  {
+    return key_value_access_proxy (*this, key);
+  }
+
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
   MTH void post_load_check ();          // do some adjustments after parsing
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
@@ -304,9 +339,9 @@
   MTH int slottype () const;
   MTH static object *create ();
   const mapxy &operator =(const mapxy &pos);
-  object &operator =(const object &src);
   MTH void copy_to (object *dst);
-  MTH object *clone (); // create + copy_to
+  MTH object *clone (); // create + copy_to a single object
+  MTH object *deep_clone (); // copy whole more chain and inventory
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
   MTH void destroy (bool destroy_inventory = false);
@@ -314,7 +349,7 @@
   // 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
-  MTH void play_sound (faceidx sound) const;
+  MTH void play_sound (faceidx sound);
 
   void do_remove ();
   MTH void remove ()
@@ -379,21 +414,26 @@
   MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
   const char *flag_desc (char *desc, int len) const;
 
-  int number_of () const
+  MTH bool decrease (sint32 nr = 1); // returns true if anything is left
+  MTH object *split (sint32 nr = 1); // return 0 on failure
+
+  MTH int number_of () const
   {
     return nrof ? nrof : 1;
   }
 
-  uint64 total_weight () const
+  MTH sint32 total_weight () const
   {
-    return weight * number_of ();
+    return (weight + carrying) * number_of ();
   }
 
+  MTH void update_weight ();
+
   // 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
+  MTH uint64 volume () const
   {
     return total_weight ()
            * 1000
@@ -427,14 +467,29 @@
    */
   MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
 
-  // returns the player that has this object in his inventory, or 0
-  MTH object *in_player () const
+  // returns the outermost owner, never returns 0
+  MTH object *outer_owner ()
+  {
+    for (object *op = this; ; op = op->owner)
+      if (!op->owner)
+        return op;
+  }
+
+  // returns the outermost environment, never returns 0
+  MTH object *outer_env ()
   {
-    for (object *op = env; op; op = op->env)
-      if (op->type == PLAYER)
+    for (object *op = this; ; op = op->env)
+      if (!op->env)
         return op;
+  }
+
+  // returns the player that has this object in his inventory, or 0
+  // we assume the player is always the outer env
+  MTH object *in_player ()
+  {
+    object *op = outer_env ();
 
-    return 0;
+    return op->type == PLAYER ? op : 0;
   }
 
   // "temporary" helper function
@@ -448,6 +503,14 @@
     return head_ () == this;
   }
 
+  MTH bool is_on_map () const
+  {
+    return !env && !flag [FLAG_REMOVED];
+  }
+
+  // returns the player that cna see this object, if any
+  MTH object *visible_to () const;
+
   MTH std::string long_desc        (object *who = 0);
   MTH std::string describe_monster (object *who = 0);
   MTH std::string describe_item    (object *who = 0);
@@ -521,13 +584,19 @@
   }
 
   /* This returns TRUE if the object is something that
-   * should be displayed in the floorbox/inventory window
+   * a client might want to know about.
    */
   MTH bool client_visible () const
   {
     return !invisible && type != PLAYER;
   }
 
+  // the client does nrof * this weight
+  MTH sint32 client_weight () const
+  {
+    return weight + carrying;
+  }
+
   MTH struct region *region () const;
 
   void statusmsg (const char *msg, int color = NDI_BLACK);
@@ -544,6 +613,10 @@
 
   object ();
   ~object ();
+
+private:
+  object &operator =(const object &);
+  object (const object &);
 };
 
 // move this object to the top of its env's inventory to speed up
@@ -594,7 +667,8 @@
 INTERFACE_CLASS (archetype)
 struct archetype : object
 {
-  static archetype *empty; // the empty_archetype
+  static arch_ptr empty; // the empty_archetype
+  MTH static void gc ();
 
   archetype (const char *name);
   ~archetype ();
@@ -605,6 +679,7 @@
   MTH void link   ();
   MTH void unlink ();
 
+  MTH static object *get (const char *name); // find()->instance()
   MTH object *instance ();
 
   object_vector_index ACC (RW, archid);         // index in archvector