--- deliantra/server/common/object.C	2007/05/07 03:05:58	1.145
+++ deliantra/server/common/object.C	2007/05/17 21:11:42	1.154
@@ -31,6 +31,7 @@
 #include <sys/uio.h>
 #include <object.h>
 #include <funcpoint.h>
+#include <sproto.h>
 #include <loader.h>
 
 #include <bitset>
@@ -451,15 +452,69 @@
   this->owner = owner;
 }
 
-void
-object::set_weapon (object *ob)
+int
+object::slottype () const
+{
+  if (type == SKILL)
+    {
+      if (IS_COMBAT_SKILL (subtype)) return slot_combat;
+      if (IS_RANGED_SKILL (subtype)) return slot_ranged;
+    }
+  else
+    {
+      if (slot [body_combat].info) return slot_combat;
+      if (slot [body_range ].info) return slot_ranged;
+    }
+  
+  return slot_none;
+}
+
+bool
+object::change_weapon (object *ob)
 {
   if (current_weapon == ob)
-    return;
+    return true;
+
+  if (chosen_skill)
+    chosen_skill->flag [FLAG_APPLIED] = false;
 
   current_weapon = ob;
-  new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
+  chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
+
+  if (chosen_skill)
+    chosen_skill->flag [FLAG_APPLIED] = true;
+
   update_stats ();
+
+  if (ob)
+    {
+      // now check wether any body locations became invalid, in which case
+      // we cannot apply the weapon at the moment.
+      for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
+        if (slot[i].used < 0)
+          {
+            current_weapon = chosen_skill = 0;
+            update_stats ();
+
+            new_draw_info_format (NDI_UNIQUE, 0, this,
+                                  "You try to balance your applied items all at once, but the %s is too much. "
+                                  "You need to unapply some items first.", &ob->name);
+            return false;
+          }
+
+      //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
+    }
+  else
+    ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
+
+  if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
+    {
+      LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
+           &name, ob->debug_desc ());
+      return false;
+    }
+
+  return true;
 }
 
 /* Zero the key_values on op, decrementing the shared-string
@@ -1612,9 +1667,9 @@
       return op;
     }
 
-  if (where->head)
+  if (where->head_ () != where)
     {
-      LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
+      LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
       where = where->head;
     }
 
@@ -1955,19 +2010,6 @@
 }
 
 /*
- * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
- * all it's inventory (recursively).
- * If checksums are used, a player will get set_cheat called for
- * him/her-self and all object carried by a call to this function.
- */
-void
-set_cheat (object *op)
-{
-  SET_FLAG (op, FLAG_WAS_WIZ);
-  flag_inv (op, FLAG_WAS_WIZ);
-}
-
-/*
  * find_free_spot(object, map, x, y, start, stop) will search for
  * a spot at the given map and coordinates which will be able to contain
  * the given object.  start and stop specifies how many squares