--- deliantra/server/include/dynbuf.h	2007/07/01 05:00:18	1.12
+++ deliantra/server/include/dynbuf.h	2007/11/08 19:43:24	1.15
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #ifndef DYNBUF_H__
@@ -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,27 @@
   { }
 
   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 vprintf (const char *format, va_list ap);
+
+  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