--- deliantra/server/include/network.h	2007/07/29 19:11:47	1.17
+++ deliantra/server/include/network.h	2008/09/08 11:27:25	1.22
@@ -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,2008 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>
  */
 
 /* This file defines various flags that both the new client and
@@ -48,7 +48,7 @@
 /* Maximum size of any packet we expect.
  *
  * The size must be the same in the server and the client (stupid).
- * TODO: make the actual network configurable per clietn and use 2**16.
+ * TODO: make the actual network configurable per client and use 2**16.
  */
 #define MAXSOCKBUF 10239
 
@@ -149,45 +149,6 @@
 #define SF_FIREON   0x01
 #define SF_RUNON    0x02
 
-/* The following are the color flags passed to new_draw_info.
- *
- * We also set up some control flags
- *
- * NDI = New Draw Info
- */
-
-/* Color specifications - note these match the order in xutil.c */
-/* Note 2:  Black, the default color, is 0.  Thus, it does not need to
- * be implicitly specified.
- */
-#define NDI_BLACK	0
-#define NDI_WHITE	1
-#define NDI_NAVY	2
-#define NDI_RED		3
-#define NDI_ORANGE	4
-#define NDI_BLUE	5	/* Actually, it is Dodger Blue */
-#define NDI_DK_ORANGE	6	/* DarkOrange2 */
-#define NDI_GREEN	7	/* SeaGreen */
-#define NDI_LT_GREEN	8	/* DarkSeaGreen,  which is actually paler */
-                                /* Than seagreen - also background color */
-#define NDI_GREY	9
-#define NDI_BROWN	10	/* Sienna */
-#define NDI_GOLD	11
-#define NDI_TAN		12	/* Khaki */
-
-#define NDI_MAX_COLOR	12	/* Last value in */
-#define NDI_COLOR_MASK	0x1f	/* Gives lots of room for expansion - we are */
-                                /* using an int anyways, so we have the space */
-                                /* to still do all the flags */
-
-#define NDI_REPLY       0x20    // is a direct reply to a user command
-#define NDI_NOCREATE	0x40    // do not create a tba if one doesn't exist
-#define NDI_CLIENT_MASK 0x7f    // what the client is allowed to see
-
-#define NDI_UNIQUE	0x1000	/* Print this out immediately, don't buffer */
-#define NDI_ALL		0x2000	/* Inform all players of this message */
-#define NDI_DEF         0x4000  // ignore colour for channel protocol
-
 /* Flags for the item command */
 enum {a_none, a_readied, a_wielded, a_worn, a_active, a_applied};
 #define F_APPLIED       0x000F
@@ -241,6 +202,7 @@
   data   (const void *ptr, int len) : len (len), ptr (ptr) { }
   data   (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
   data   (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  data   (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 
 struct data8
@@ -251,6 +213,7 @@
   data8  (const void *ptr, int len) : len (len), ptr (ptr) { }
   data8  (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
   data8  (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  data8  (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 
 struct data16
@@ -261,6 +224,7 @@
   data16 (const void *ptr, int len) : len (len), ptr (ptr) { }
   data16 (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
   data16 (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  data16 (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 
 struct ber32