--- deliantra/server/include/cfperl.h 2009/11/05 14:38:48 1.110 +++ deliantra/server/include/cfperl.h 2009/11/11 17:41:14 1.111 @@ -198,7 +198,7 @@ F_DESTROYED = 0x01, F_DEBUG_TRACE = 0x02, }; - uint8 ACC (RW, flags); + uint8 ACC (RW, attachable_flags); static unordered_vector mortals; MTH static void check_mortals (); @@ -214,7 +214,7 @@ MTH void destroy (); // return wether an object was destroyed already - MTH bool destroyed () const { return flags & F_DESTROYED; } + MTH bool destroyed () const { return attachable_flags & F_DESTROYED; } virtual void gather_callbacks (AV *&callbacks, event_type event) const; @@ -232,12 +232,12 @@ void optimise (); // possibly save some memory by destroying unneeded data attachable () - : flags (0), self (0), cb (0), attach (0) + : attachable_flags (0), self (0), cb (0), attach (0) { } attachable (const attachable &src) - : flags (0), self (0), cb (0), attach (src.attach) + : attachable_flags (0), self (0), cb (0), attach (src.attach) { }