--- deliantra/server/include/object.h	2007/04/16 13:02:29	1.107
+++ deliantra/server/include/object.h	2007/05/07 03:05:58	1.116
@@ -31,7 +31,8 @@
 #include "shstr.h"
 
 typedef int tag_t;
-#define NUM_BODY_LOCATIONS      12
+
+#define NUM_BODY_LOCATIONS      14
 #define BODY_ARMS               1
 
 /* See common/item.c */
@@ -91,6 +92,12 @@
  * e.g. ->copy_to ()
  */
 
+struct body_slot
+{
+  sint8 info:4;	/* body info as loaded from the file */
+  sint8 used:4;	/* Calculated value based on items equipped */
+};
+
 INTERFACE_CLASS (object)
 // these are being copied
 struct object_copy : attachable
@@ -159,8 +166,7 @@
   sint64 ACC (RW, perm_exp);	/* Permanent exp */
   uint32 ACC (RW, weapontype);	/* type of weapon */
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
-  sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]);	/* body info as loaded from the file */
-  sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]);	/* Calculated value based on items equipped */
+  body_slot slot [NUM_BODY_LOCATIONS];
   faceidx ACC (RW, face);	/* Face with colors */
   living ACC (RO, stats);	/* Str, Con, Dex, etc */
   /* See the pod/objects.pod for more info about body locations */
@@ -275,6 +281,7 @@
 
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
+  MTH void set_weapon (object *ob);
 
   MTH void open_container (object *new_container);
   MTH void close_container ()
@@ -296,8 +303,7 @@
 
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
-  MTH const char *debug_desc () const;
-  const char *debug_desc2 () const; // another debug_desc, pure convinience function
+  MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
   const char *flag_desc (char *desc, int len) const;
 
   int number_of () const
@@ -333,6 +339,7 @@
   MTH bool is_arrow  () const { return type == ARROW
                                        || (type == SPELL_EFFECT
                                            && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
+  MTH bool is_range  () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
 
   MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; }
 
@@ -363,6 +370,19 @@
     return head ? head : this;
   }
 
+  MTH std::string long_desc        (object *who = 0);
+  MTH std::string describe_monster (object *who = 0);
+  MTH std::string describe_item    (object *who = 0);
+  MTH std::string describe         (object *who = 0);
+
+  // If this object has no extra parts but should have them,
+  // add them, effectively expanding heads into multipart
+  // objects. This method only works on objects not inserted
+  // anywhere.
+  MTH void expand_tail ();
+
+  MTH void create_treasure (treasurelist *tl, int flags = 0);
+
   // insert object at same map position as 'where'
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
@@ -375,7 +395,7 @@
   // set the givne flag on all objects in the inventory recursively
   MTH void set_flag_inv (int flag, int value = 1);
 
-  void enter_exit (object *exit);//PERL
+  void enter_exit (object *exit);//Perl
   MTH void enter_map (maptile *newmap, int x, int y);
 
   // returns the mapspace this object is in
@@ -484,8 +504,8 @@
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  static bool load (object_thawer &f);
-  static archetype *get (const char *name); // find or create
+  static archetype *read (object_thawer &f);
+  static archetype *get  (const char *name); // find or create
   static archetype *find (const char *name);
 
   void hash_add (); // add to hashtable
@@ -546,7 +566,6 @@
 #define INS_MAP_LOAD            0x0020
 
 #define ARCH_SINGULARITY        "singularity"
-#define ARCH_SINGULARITY_LEN    11
 #define ARCH_DETECT_MAGIC       "detect_magic"
 #define ARCH_DEPLETION          "depletion"
 #define ARCH_SYMPTOM            "symptom"