--- deliantra/server/include/cfperl.h 2006/08/27 15:24:21 1.9 +++ deliantra/server/include/cfperl.h 2006/08/27 17:59:26 1.10 @@ -78,7 +78,7 @@ bool cfperl_invoke (event_type event, ...); int cfperl_result_INT (int idx); -struct extendable_base +struct attachable_base { void *self, *cb; // CF+ perl self and callback const char *attach; // generic extension attachment information @@ -86,18 +86,18 @@ void clear (); // called when free'ing objects void optimise (); // possibly save some memory by destroying unneeded data - void extendable_init () + void attachable_init () { self = cb = 0; attach = 0; } }; -// objects extendable from perl (or any other extension) should include or +// objects attachable from perl (or any other extension) should include or // derive using the curiously recurring template pattern, to avoid // virtual method calls etc. template -struct extendable : extendable_base +struct attachable : attachable_base { static data_type get_dt () { @@ -114,12 +114,12 @@ object_freezer (const char *filename); ~object_freezer (); - void put (extendable_base *ext); + void put (attachable_base *ext); template - void put (extendable *obj) + void put (attachable *obj) { - put ((extendable_base *)obj); + put ((attachable_base *)obj); } void finish (); @@ -133,10 +133,10 @@ object_thawer (const char *filename = 0); ~object_thawer (); - void get (data_type type, void *obj, extendable_base *ext); + void get (data_type type, void *obj, attachable_base *ext); template - void get (extendable *obj) + void get (attachable *obj) { if (av) get (subclass::get_dt (), (subclass *)obj, obj);