--- deliantra/server/include/object.h	2008/05/03 09:04:17	1.171
+++ deliantra/server/include/object.h	2008/08/28 19:31:46	1.180
@@ -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;
@@ -177,7 +177,7 @@
 
   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 */
+  sint32 ACC (RW, nrof);	/* How many of the objects */
 
   /* This next big block is basically used for monsters and equipment */
   uint16 ACC (RW, client_type);	/* Public type information.  see doc/Developers/objects */
@@ -262,9 +262,11 @@
   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 */
-  sint16 ACC (RW, elevation);	/* elevation of this terrain - not currently used */
   uint8 ACC (RW, smoothlevel);	/* how to smooth this square around */
   uint8 ACC (RW, will_apply);	/* See crossfire.doc */
+  uint16 ACC (RW, cached_sp);   /* cached spell points used for a spell, used by esrv_update_spells */
+  uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */
+  uint16 ACC (RW, cached_eat);  /* cached food, used by esrv_update_spells */
 };
 
 struct object : zero_initialised, object_copy
@@ -296,6 +298,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.
@@ -305,7 +342,8 @@
   MTH static object *create ();
   const mapxy &operator =(const mapxy &pos);
   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);
@@ -431,6 +469,8 @@
    */
   MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
 
+  MTH bool has_dialogue () const { return *&msg == '@'; }
+
   // returns the outermost owner, never returns 0
   MTH object *outer_owner ()
   {
@@ -503,6 +543,7 @@
 
   void enter_exit (object *exit);//Perl
   MTH void enter_map (maptile *newmap, int x, int y);
+  void player_goto (const char *path, int x, int y); // only for players
 
   // returns the mapspace this object is in
   mapspace &ms () const;
@@ -643,7 +684,7 @@
   MTH void link   ();
   MTH void unlink ();
 
-  MTH static object *get (const char *name); // find()->instance()
+  MTH static object *get (const char *name); // (find() || singularity)->instance()
   MTH object *instance ();
 
   object_vector_index ACC (RW, archid);         // index in archvector
@@ -658,6 +699,13 @@
   static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone  other_arch reference */
 };
 
+// compatbiility, remove once replaced by ->instance
+inline object *
+arch_to_object (archetype *at)
+{
+  return at->instance ();
+}
+
 inline void
 object_freezer::put (keyword k, archetype *v)
 {
@@ -672,15 +720,20 @@
 extern activevec actives;
 extern archvec   archetypes;
 
-#define for_all_objects(var)                    \
+// "safely" iterate over inv in a way such that the current item is removable
+// quite horrible, thats why its hidden in some macro
+#define for_inv_removable(op,var)			\
+  for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
+
+#define for_all_objects(var)                    	\
   for (unsigned _i = 0; _i < objects.size (); ++_i)     \
     statementvar (object *, var, objects [_i])
 
-#define for_all_actives(var)                    \
+#define for_all_actives(var)                    	\
   for (unsigned _i = 0; _i < actives.size (); ++_i)     \
     statementvar (object *, var, actives [_i])
 
-#define for_all_archetypes(var)                 \
+#define for_all_archetypes(var)                 	\
   for (unsigned _i = 0; _i < archetypes.size (); ++_i)  \
     statementvar (archetype *, var, archetypes [_i])