--- deliantra/server/include/object.h	2007/05/07 06:01:48	1.118
+++ deliantra/server/include/object.h	2007/05/14 21:32:26	1.122
@@ -33,14 +33,14 @@
 typedef int tag_t;
 
 enum {
+  body_skill,
+  body_combat,
   body_range,
   body_shield,
-  body_combat,
   body_arm,
   body_torso,
   body_head,
   body_neck,
-  body_skill,
   body_finger,
   body_shoulder,
   body_foot,
@@ -50,6 +50,13 @@
   NUM_BODY_LOCATIONS
 };
 
+enum slottype_t
+{
+  slot_none,
+  slot_combat,
+  slot_ranged,
+};
+
 /* See common/item.c */
 
 typedef struct Body_Locations
@@ -273,6 +280,7 @@
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
 
+  MTH int slottype () const;
   MTH static object *create ();
   object &operator =(const object &src);
   MTH void copy_to (object *dst);
@@ -291,6 +299,24 @@
       do_remove ();
   }
 
+  // move this object to the top of its env's inventory to speed up
+  // searches for it.
+  MTH object *inv_splay ()
+  {
+    if (env && env->inv != this)
+      {
+        if (above) above->below = below;
+        if (below) below->above = above;
+
+        above = 0;
+        below = env->inv;
+        below->above = this;
+        env->inv = this;
+      }
+
+    return this;
+  }
+
   static bool can_merge_slow (object *op1, object *op2);
 
   // this is often used in time-critical code, so optimise
@@ -303,7 +329,7 @@
 
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
-  MTH void set_weapon (object *ob);
+  MTH bool change_weapon (object *ob);
 
   MTH void open_container (object *new_container);
   MTH void close_container ()
@@ -510,6 +536,11 @@
   struct oblinkpt *next;
 } oblinkpt;
 
+object *find_skill_by_name (object *who, const char *name);
+object *find_skill_by_name (object *who, const shstr &sh);
+object *find_skill_by_number (object *who, int skillno);
+int change_skill (object *who, object *new_skill, int flag);
+
 /*
  * The archetype structure is a set of rules on how to generate and manipulate
  * objects which point to archetypes.