--- deliantra/server/include/object.h	2006/12/15 20:07:02	1.54
+++ deliantra/server/include/object.h	2006/12/18 02:35:01	1.56
@@ -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.de
+    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"
 
@@ -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 */