--- deliantra/server/include/object.h	2007/05/17 20:27:01	1.123
+++ deliantra/server/include/object.h	2007/05/28 21:15:56	1.128
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer Online RPG
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
- *
- * This program 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
- * (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
- * 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
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * 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
+ * 
+ * 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 (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 GNU General Public License
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 #ifndef OBJECT_H
@@ -61,7 +61,7 @@
 
 typedef struct Body_Locations
 {
-  const char *save_name;	/* Name used to load/save it to disk */
+  keyword     save_name;	/* Name used to load/save it to disk */
   const char *use_name;		/* Name used when describing an item we can use */
   const char *nonuse_name;	/* Name to describe objects we can't use */
 } Body_Locations;
@@ -109,11 +109,6 @@
 #define WILL_APPLY_DOOR         0x08
 #define WILL_APPLY_FOOD         0x10
 
-/* However, if you're keeping a pointer of some sort, you probably
- * don't just want it copied, so you'll need to add to common/object.C,
- * e.g. ->copy_to ()
- */
-
 struct body_slot
 {
   signed char info:4;	/* body info as loaded from the file */
@@ -299,24 +294,6 @@
       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
@@ -338,6 +315,12 @@
     open_container (0);
   }
 
+  // overwrite the attachable should_invoke function with a version that also checks ev_want_type
+  bool should_invoke (event_type event)
+  {
+    return ev_want_event [event] || ev_want_type [type] || cb;
+  }
+
   MTH void instantiate ();
 
   // recalculate all stats
@@ -510,6 +493,25 @@
   ~object ();
 };
 
+// move this object to the top of its env's inventory to speed up
+// searches for it.
+static object *
+splay (object *ob)
+{
+  if (ob->env && ob->env->inv != ob)
+    {
+      if (ob->above) ob->above->below = ob->below;
+      if (ob->below) ob->below->above = ob->above;
+
+      ob->above = 0;
+      ob->below = ob->env->inv;
+      ob->below->above = ob;
+      ob->env->inv = ob;
+    }
+
+  return ob;
+}
+
 typedef object_vector<object, &object::index > objectvec;
 typedef object_vector<object, &object::active> activevec;