--- deliantra/server/include/object.h	2006/12/15 20:08:45	1.55
+++ deliantra/server/include/object.h	2006/12/18 17:39:17	1.58
@@ -24,6 +24,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
+#include <bitset>
+
 #include "cfperl.h"
 #include "shstr.h"
 
@@ -218,12 +220,12 @@
   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 */
+  std::bitset<NUM_FLAGS> 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 */
@@ -285,6 +287,23 @@
   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]; }
+
   // fully recursive iterator
   struct iterator_base
   {