--- deliantra/server/include/object.h	2009/06/27 08:25:36	1.202
+++ deliantra/server/include/object.h	2009/09/16 22:50:50	1.206
@@ -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 */
@@ -534,7 +535,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 +545,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 +599,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); }