--- deliantra/server/include/dynbuf.h	2007/07/01 05:00:18	1.12
+++ deliantra/server/include/dynbuf.h	2007/07/10 05:51:38	1.13
@@ -48,33 +48,52 @@
   };
 
   char *ptr, *end;
-  int ext;
   int _size;
 
+  int extend;
   chunk *first, *last;
 
-  void _reserve (int size);
-  void _clear ();
-  void clear ();
-  void finish ();
+  void reserve (int size);
+  void init (int initial);  // allocate sinitial chunk
+  void free (chunk *&chain); // free chain of chunks
+  char *_linearise ();
+  void finalise ();
 
 public:
   
-  dynbuf (int initial = 4096, int extend = 16384);
-  ~dynbuf ();
+  // initial - the size of the initial chunk to be allocated
+  // extend  - first incremental step when buffer size exceeded
+  dynbuf (int initial = 4096, int extend = 16384)
+  : extend (extend)
+  {
+    init (initial);
+  }
+
+  ~dynbuf ()
+  {
+    free (first);
+  }
+
+  // resets the dynbuf, but does not free the first chunk
+  // which is either of size "initial" or the size of the last
+  // linearise
+  void clear ();
 
   int  size  () const { return _size + (ptr - last->data); }
   bool empty () const { return !size (); }
 
   void linearise (void *data);
-  char *linearise (); // does not 0-terminate(!)
+  char *linearise () // does not 0-terminate(!)
+  { 
+    return first->next ? _linearise () : first->data;
+  }
 
   int room () const { return end - ptr; }
 
   char *force (int size)
   {
     if (expect_false (ptr + size >= end))
-      _reserve (size);
+      reserve (size);
 
     return ptr;
   }
@@ -139,11 +158,26 @@
   { }
 
   using dynbuf::add;
-
   void add (sint32 i);
   void add (sint64 i);
 
+  //TODO: should optimise the case printf "(name %+d)" as it comes up extreemly often
+
+  using dynbuf::operator <<;
+  dynbuf &operator << (sint16 i) { add (sint32 (i)); return *this; }
+  dynbuf &operator << (uint16 i) { add (sint32 (i)); return *this; }
+  dynbuf &operator << (sint32 i) { add (sint32 (i)); return *this; }
+  dynbuf &operator << (sint64 i) { add (sint64 (i)); return *this; }
+  dynbuf &operator << (uint32 i) { add (sint64 (i)); return *this; }
+  dynbuf &operator << (uint64 i) { add (sint64 (i)); return *this; }
+
   void printf (const char *format, ...);
+
+  void add_abilities (const char *name, uint32 abilities);
+  void add_paths     (const char *name, uint32 paths);
+
+  // returns the string, linearised and with trailing \0
+  operator const char * ();
 };
 
 #endif