--- deliantra/server/include/object.h	2006/12/13 18:08:01	1.53
+++ deliantra/server/include/object.h	2006/12/22 16:54:56	1.63
@@ -18,12 +18,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 
 #ifndef OBJECT_H
 #define OBJECT_H
 
+#include <bitset>
+
 #include "cfperl.h"
 #include "shstr.h"
 
@@ -120,6 +122,7 @@
   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
   maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
+  client_container *seen_by;    // seen by which player/container currently?
 };
 
 // these are being copied
@@ -144,11 +147,15 @@
   object_ptr ACC (RW, spellitem);	/* Spell ability monster is choosing to use */
   object_ptr ACC (RW, spell);	/* Spell that was being cast */
   object_ptr ACC (RW, current_weapon);	/* Pointer to the weapon currently used */
+  arch_ptr ACC (RW, arch);	/* Pointer to archetype */
+  arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
 };
 
 // these are being copied and also cleared
 struct object_pod
 {
+  typedef bitset<NUM_FLAGS> flags_t;
+
   New_Face *ACC (RW, face);	/* Face with colors */
   sint16 ACC (RW, x), ACC (RW, y);	/* Position in the map for this object */
   float ACC (RW, speed);	/* The overall speed of this object */
@@ -218,12 +225,10 @@
   char *ACC (RW, spellarg);
 
   /* Following are values used by any object */
+  /* this objects turns into or what this object creates */
   treasurelist *ACC (RW, randomitems);	/* Items to be generated */
-  arch_ptr ACC (RW, arch);	/* Pointer to archetype */
-  arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
   key_value *key_values;	/* Fields not explictly known by the loader. */
-  /* this objects turns into or what this object creates */
-  uint32 flags[4];		/* various flags */
+  object_pod::flags_t flags;        /* various flags */
   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 */
@@ -242,6 +247,7 @@
 
 struct object : zero_initialised, object_keep, object_copy, object_pod
 {
+  typedef object_pod::flags_t flags_t;
   typedef unordered_vector<object *> vector;
 
   static vector mortals;
@@ -267,8 +273,6 @@
         && can_merge_slow (op1, op2);
   }
 
-  void clear ();
-
   bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
 
   void set_owner (object *owner);
@@ -281,10 +285,50 @@
     attachable<object>::instantiate ();
   }
 
+  // recalculate all stats
+  void update_stats ();
+  void roll_stats ();
+  void swap_stats (int a, int b);
+  void add_statbonus ();
+  void remove_statbonus ();
+  void drain_stat ();
+  void drain_specific_stat (int deplete_stats);
+  void change_luck (int value);
+
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
   const char *debug_desc () const;
 
+  bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
+  bool is_armor  () const { return type == ARMOUR  || type == SHIELD || type == HELMET
+                                || type == CLOAK   || type == BOOTS  || type == GLOVES
+                                || type == BRACERS || type == GIRDLE; }
+  bool is_alive  () const { return (type == PLAYER
+                                    || flags [FLAG_MONSTER]
+                                    || (flags [FLAG_ALIVE] && !flags [FLAG_GENERATOR] && type != DOOR))
+                                   && !flags [FLAG_IS_A_TEMPLATE]; }
+  bool is_arrow  () const { return type == ARROW
+                                 || (type == SPELL_EFFECT
+                                     && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
+
+  /* This return true if object has still randomitems which
+   * could be expanded.
+   */
+  bool has_random_items () const { return randomitems && !flags [FLAG_IS_A_TEMPLATE]; }
+
+  // returns the player that has this object in his inventory, or 0
+  object *in_player () const
+  {
+    for (object *op = env; op; op = op->env)
+      if (op->type == PLAYER)
+        return op;
+
+    return 0;
+  }
+
+  // returns the mapspace this object is in
+  mapspace &ms () const;
+
   // fully recursive iterator
   struct iterator_base
   {
@@ -382,7 +426,7 @@
 /* This returns TRUE if the object is something that
  * should be displayed in the look window
  */
-#define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR)
+#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
 
 /* Used by update_object to know if the object being passed is
  * being added or removed.