--- deliantra/server/include/object.h	2007/05/18 12:13:02	1.124
+++ deliantra/server/include/object.h	2007/05/27 23:56:21	1.127
@@ -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 */
@@ -320,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