--- deliantra/server/common/object.C	2010/01/16 13:41:37	1.311
+++ deliantra/server/common/object.C	2010/04/07 19:54:44	1.320
@@ -2,8 +2,8 @@
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
  * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -522,6 +522,21 @@
 }
 
 /*
+ * Returns the object which has the uuid equal to the argument.
+ * MOAR VERRRY slow.
+ */
+
+object *
+find_object_uuid (UUID i)
+{
+  for_all_objects (op)
+   if (op->uuid == i)
+     return op;
+
+  return 0;
+}
+
+/*
  * Returns the first object which has a name equal to the argument.
  * Used only by the patch command, but not all that useful.
  * Enables features like "patch <name-of-other-player> food 999"
@@ -561,73 +576,6 @@
   this->owner = owner;
 }
 
-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 true;
-
-  if (chosen_skill)
-    chosen_skill->flag [FLAG_APPLIED] = false;
-
-  current_weapon = ob;
-  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 all your items at once, "
-                                  "but the %s is just too much for your body. "
-                                  "[You need to unapply some items first - use the 'body' command to see "
-                                  "how many items you cna wera on a specific body part.]", &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
  * refcounts and freeing the links. 
  */
@@ -993,6 +941,27 @@
     }
 }
 
+/*
+ * Remove and free all objects in the inventory of the given object.
+ * Unlike destroy_inv, this assumes the *this is destroyed as well
+ * well, so we can (and have to!) take shortcuts.
+ */
+void
+object::destroy_inv_fast ()
+{
+  while (object *op = inv)
+    {
+      // remove from object the fast way
+      op->flag [FLAG_REMOVED] = true;
+      op->env = 0;
+      if ((inv = inv->below))
+        inv->above = 0;
+
+      // then destroy
+      op->destroy ();
+    }
+}
+
 object *object::create ()
 {
   object *op = new object;
@@ -1072,7 +1041,7 @@
       return;
     }
 
-  destroy_inv (false);
+  destroy_inv_fast ();
 
   if (is_head ())
     if (sound_destroy)
@@ -1136,9 +1105,23 @@
 
       if (pl && pl->is_player ())
         {
+          if (expect_false (pl->contr->combat_ob == this))
+            {
+              pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
+              pl->contr->combat_ob = 0;
+              if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
+            }
+
+          if (expect_false (pl->contr->ranged_ob == this))
+            {
+              pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
+              pl->contr->ranged_ob = 0;
+              if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
+            }
+
           pl->contr->queue_stats_update ();
 
-          if (glow_radius && pl->is_on_map ())
+          if (expect_false (glow_radius) && pl->is_on_map ())
             update_all_los (pl->map, pl->x, pl->y);
         }
     }
@@ -1318,7 +1301,7 @@
  *
  * Return value:
  *   new object if 'op' was merged with other object
- *   NULL if 'op' was destroyed
+ *   NULL if there was an error (destroyed, blocked etc.)
  *   just 'op' otherwise
  */
 object *
@@ -2680,3 +2663,19 @@
     }
 }
 
+void object::change_move_type (MoveType mt)
+{
+  if (move_type == mt)
+    return;
+
+  if (is_on_map ())
+    {
+      // we are on the map, so handle move_on/off effects
+      remove ();
+      move_type = mt;
+      map->insert (this, x, y, this);
+    }
+  else
+    move_type = mt;
+}
+