--- deliantra/server/include/object.h	2009/06/27 08:35:03	1.203
+++ deliantra/server/include/object.h	2009/10/19 21:48:49	1.213
@@ -5,18 +5,19 @@
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -319,7 +320,7 @@
   object *inv;			/* Pointer to the first object in the inventory */
 
   //TODO: container must move into client
-  object_ptr ACC (RW, container);	/* Current container being used.  I think this
+  object_ptr ACC (RW, container);/* Currently opened container.  I think this
 				 * is only used by the player right now.
 				 */
   object *ACC (RW, env);	/* Pointer to the object which is the environment.
@@ -327,7 +328,6 @@
 				 */
   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. */
 
   // privates / perl
@@ -437,7 +437,22 @@
     open_container (0);
   }
 
+  // potential future accessor for "container"
+  MTH object *container_ () const
+  {
+    return container;
+  }
+
+  MTH bool is_open_container () const
+  {
+    // strangely enough, using ?: here causes code to inflate
+    return type == CONTAINER
+        && ((env && env->container_ () == this)
+            || (!env && flag [FLAG_APPLIED]));
+  }
+
   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;
@@ -494,6 +509,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
@@ -521,7 +538,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 ()
@@ -535,7 +554,7 @@
   }
 
   // returns the outermost environment, never returns 0
-  MTH object *outer_env () const
+  MTH object *outer_env_or_self () const
   {
     const object *op;
 
@@ -545,11 +564,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;
   }
@@ -593,10 +618,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); }
@@ -701,17 +726,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   ();
@@ -730,7 +757,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;