--- deliantra/server/include/cfperl.h 2006/08/28 14:05:24 1.12 +++ deliantra/server/include/cfperl.h 2006/08/30 11:02:15 1.15 @@ -85,8 +85,9 @@ void *self, *cb; // CF+ perl self and callback const char *attach; // generic extension attachment information - void clear (); // called when free'ing objects - void optimise (); // possibly save some memory by destroying unneeded data + void clear (); // called when free'ing objects + void optimise (); // possibly save some memory by destroying unneeded data + void instantiate (data_type type, void *obj); void attachable_init () { @@ -103,7 +104,13 @@ { static data_type get_dt () { - subclass::get_dt (); + return subclass::get_dt (); + } + + void instantiate () + { + if (attach) + attachable_base::instantiate (get_dt (), static_cast(this)); } }; @@ -111,8 +118,6 @@ { void *av; FILE *fp; - - operator FILE *() { return fp; } }; struct object_freezer : object_freezethaw @@ -129,11 +134,13 @@ { put ((attachable_base *)obj); } + + operator bool () { return !!fp; } }; struct object_thawer : object_freezethaw { - object_thawer (FILE *fp, const char *filename = 0); + object_thawer (const char *filename = 0); ~object_thawer (); void get (data_type type, void *obj, attachable_base *ext, int oid); @@ -144,7 +151,12 @@ if (av) get (subclass::get_dt (), (subclass *)obj, obj, oid); } + + operator FILE *() { return fp; } }; +int fprintf (object_freezer &freezer, const char *format, ...); +int fputs (const char *s, object_freezer &freezer); + #endif