--- deliantra/server/include/cfperl.h 2006/09/03 22:45:56 1.21 +++ deliantra/server/include/cfperl.h 2006/09/04 11:07:59 1.22 @@ -89,12 +89,22 @@ void optimise (); // possibly save some memory by destroying unneeded data void instantiate (data_type type, void *obj); - void attachable_init () + void attachable_clear () { self = 0; cb = 0; attach = 0; } + + attachable_base () + { + attachable_clear (); + } + + attachable_base (const attachable_base &src) + : self (0), cb (0), attach (src.attach) + { + } }; // objects attachable from perl (or any other extension) should include or @@ -130,10 +140,8 @@ { add (k); - //if (v) - add (' '); //TODO//cf compatibility always add space if (v) - add (v); + add (' '), add (v); add ('\n'); } @@ -147,18 +155,45 @@ add ('\n'); } +#if 1 void put (keyword k, const char *v) { int klen = keyword_len [k]; - int vlen = v ? strlen (v) : 0; + int vlen = v ? strlen (v) + 1 : 0; + + char *p = (char *)alloc (klen + vlen + 1); + + memcpy (p, keyword_str [k], klen); p += klen; + + if (v) + { + *p++ = ' '; vlen--; //TODO//cf compatibility always add space + memcpy (p, v, vlen); p += vlen; + } + + *p = '\n'; + } +#endif + +#if 0 + void put (keyword k, const shstr &v) + { + int klen = keyword_len [k]; + int vlen = v ? v.length () + 1 : 0; - char *p = (char *)alloc (klen + 1 + vlen + 1); + char *p = (char *)alloc (klen + vlen + 1); memcpy (p, keyword_str [k], klen); p += klen; - *p++ = ' '; //TODO//cf compatibility always add space - memcpy (p, v, vlen); p += vlen; + + if (v) + { + *p++ = ' '; vlen--; //TODO//cf compatibility always add space + memcpy (p, v, vlen); p += vlen; + } + *p = '\n'; } +#endif void put (keyword k, double v) {