--- deliantra/server/include/object.h 2007/05/19 00:08:11 1.125 +++ deliantra/server/include/object.h 2007/05/26 15:44:04 1.126 @@ -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,16 +315,10 @@ open_container (0); } - // overwrite the attachable invoke function with a version that also checks ev_want_type - bool invoke (event_type event, ...) + // overwrite the attachable should_invoke function with a version that also checks ev_want_type + bool should_invoke (event_type event) { - if (ev_want_event [event] || ev_want_type [type] || cb) - { - va_list ap; - va_start (ap, event); - vinvoke (event, ap); - va_end (ap); - } + return ev_want_event [event] || ev_want_type [type] || cb; } MTH void instantiate ();