--- deliantra/server/common/object.C	2007/05/17 21:32:08	1.155
+++ deliantra/server/common/object.C	2007/07/05 08:10:29	1.164
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * 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@schmorp.de>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
@@ -497,8 +496,9 @@
             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);
+                                  "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.]", &ob->name);
             return false;
           }
 
@@ -938,18 +938,19 @@
     y = 1;
   }
 
-  head = 0;
-
   if (more)
     {
       more->destroy ();
       more = 0;
     }
 
-  // clear those pointers that likely might have circular references to us
-  owner       = 0;
-  enemy       = 0;
-  attacked_by = 0;
+  head = 0;
+
+  // clear those pointers that likely might cause circular references
+  owner          = 0;
+  enemy          = 0;
+  attacked_by    = 0;
+  current_weapon = 0;
 }
 
 void
@@ -1117,11 +1118,6 @@
                 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
             }
 
-          /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
-          //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
-          if (tmp->above == tmp)
-            tmp->above = 0;
-
           last = tmp;
         }
 
@@ -1182,7 +1178,7 @@
 
   object *prev = this;
 
-  for (archetype *at = arch->more; at; at = at->more)
+  for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
     {
       object *op = arch_to_object (at);
 
@@ -1206,8 +1202,8 @@
 {
   for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
     {
-      tmp->x = x + tmp->arch->clone.x;
-      tmp->y = y + tmp->arch->clone.y;
+      tmp->x = x + tmp->arch->x;
+      tmp->y = y + tmp->arch->y;
     }
 
   return insert_ob_in_map (op, m, originator, flag);
@@ -1489,7 +1485,7 @@
   /* first search for itself and remove any old instances */
 
   for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
-    if (!strcmp (tmp->arch->name, arch_string))       /* same archetype */
+    if (!strcmp (tmp->arch->archname, arch_string))       /* same archetype */
       tmp->destroy ();
 
   tmp1 = arch_to_object (archetype::find (arch_string));
@@ -2496,7 +2492,7 @@
            * it, we save the empty value so that when we load,
            * we get this value back again.
            */
-          if (get_ob_key_link (&op->arch->clone, canonical_key))
+          if (get_ob_key_link (op->arch, canonical_key))
             field->value = 0;
           else
             {
@@ -2575,7 +2571,6 @@
     item = item->env;
 }
 
-
 const char *
 object::flag_desc (char *desc, int len) const
 {
@@ -2707,4 +2702,36 @@
     }
 }
 
+object *
+object::force_find (const shstr name)
+{
+  /* cycle through his inventory to look for the MARK we want to 
+   * place 
+   */
+  for (object *tmp = inv; tmp; tmp = tmp->below)
+    if (tmp->type == FORCE && tmp->slaying == name)
+      return splay (tmp);
+
+  return 0;
+}
+
+void
+object::force_add (const shstr name, int duration)
+{
+  if (object *force = force_find (name))
+    force->destroy ();
+
+  object *force = get_archetype (FORCE_NAME);
+
+  force->slaying    = name;
+  force->stats.food = 1;
+  force->speed_left = -1.f;
+
+  force->set_speed (duration ? 1.f / duration : 0.f);
+  force->flag [FLAG_IS_USED_UP] = true;
+  force->flag [FLAG_APPLIED]    = true;
+
+  insert (force);
+}
+