--- deliantra/server/include/object.h	2009/06/27 08:25:36	1.202
+++ deliantra/server/include/object.h	2009/10/11 05:43:35	1.211
@@ -264,8 +264,9 @@
 
   // 8 free bits
 
-  float ACC (RW, expmul);	/* needed experience = (calc_exp*expmul) - means some */
-				/* races/classes can need less/more exp to gain levels */
+  //float ACC (RW, expmul) = 1.0;	/* needed experience = (calc_exp*expmul) - means some */
+  //                                    /* races/classes can need less/more exp to gain levels */
+  static const float expmul = 1.0;//D
   float ACC (RW, move_slow_penalty);	/* How much this slows down the object */
 
   /* Following are values used by any object */
@@ -437,6 +438,7 @@
   }
 
   MTH object *force_find (shstr_tmp name);
+  MTH void force_set_timer (int duration);
   MTH object *force_add (shstr_tmp name, int duration = 0);
 
   oblinkpt *find_link () const;
@@ -493,6 +495,8 @@
            / dominant_material ()->density;
   }
 
+  MTH bool is_arch   () const { return this == (const object *)(const archetype *)arch; }
+
   MTH bool is_wiz    () const { return flag [FLAG_WIZ]; }
   MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
   MTH bool is_armor  () const { return type == ARMOUR  || type == SHIELD || type == HELMET
@@ -520,7 +524,9 @@
    */
   MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
 
-  MTH bool has_dialogue () const { return *&msg == '@'; }
+  static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
+
+  MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
 
   // returns the outermost owner, never returns 0
   MTH object *outer_owner ()
@@ -534,7 +540,7 @@
   }
 
   // returns the outermost environment, never returns 0
-  MTH object *outer_env () const
+  MTH object *outer_env_or_self () const
   {
     const object *op;
 
@@ -544,11 +550,17 @@
     return const_cast<object *>(op);
   }
 
+  // returns the outermost environment, may return 0
+  MTH object *outer_env () const
+  {
+    return env ? outer_env_or_self () : 0;
+  }
+
   // 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 () const
   {
-    object *op = outer_env ();
+    object *op = outer_env_or_self ();
 
     return op->type == PLAYER ? op : 0;
   }
@@ -592,10 +604,10 @@
   // 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 long_desc        (object *who = 0); // query_name . " " . describe
   MTH std::string describe_monster (object *who = 0);
   MTH std::string describe_item    (object *who = 0);
-  MTH std::string describe         (object *who = 0);
+  MTH std::string describe         (object *who = 0); // long description, without name
 
   MTH const char *query_weight     () { return ::query_weight     (this); }
   MTH const char *query_name       () { return ::query_name       (this); }
@@ -700,17 +712,19 @@
   MTH void make_noise ();
 
   /* animation */
-  bool has_anim () { return animation_id; }
+  MTH bool has_anim () const { return animation_id; }
   const animation &anim () const { return animations [animation_id]; }
-  faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
-  void set_anim_frame (int frame) { face = get_anim_frame (frame); }
+  MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
+  MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
   /* anim_frames () returns the number of animations allocated.  The last
    * usuable animation will be anim_frames () - 1 (for example, if an object
    * has 8 animations, anim_frames () will return 8, but the values will
    * range from 0 through 7.
    */
-  int anim_frames  () const { return anim ().num_animations; }
-  int anim_facings () const { return anim ().facings; }
+  MTH int anim_frames  () const { return anim ().num_animations; }
+  MTH int anim_facings () const { return anim ().facings; }
+
+  MTH char *as_string ();
 
 protected:
   void link   ();
@@ -729,7 +743,7 @@
 static object *
 splay (object *ob)
 {
-  if (ob->env && ob->env->inv != ob)
+  if (ob->above && ob->env)
     {
       if (ob->above) ob->above->below = ob->below;
       if (ob->below) ob->below->above = ob->above;