--- deliantra/server/include/network.h 2007/07/01 05:00:18 1.14
+++ deliantra/server/include/network.h 2007/11/08 19:43:24 1.20
@@ -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 .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/* This file defines various flags that both the new client and
@@ -47,10 +47,10 @@
/* Maximum size of any packet we expect.
*
- * The size must be the same in the server and the client (stupid), and its also NOT
- * the maximum buffer size as one would expect, but the maximum buffer size + 1.
+ * The size must be the same in the server and the client (stupid).
+ * TODO: make the actual network configurable per client and use 2**16.
*/
-#define MAXSOCKBUF 10240
+#define MAXSOCKBUF 10239
#define CS_QUERY_YESNO 0x1 /* Yes/no question */
#define CS_QUERY_SINGLECHAR 0x2 /* Single character response expected */
@@ -149,41 +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 0xff /* 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_UNIQUE 0x100 /* Print this out immediately, don't buffer */
-#define NDI_ALL 0x200 /* Inform all players of this message */
-
/* Flags for the item command */
enum {a_none, a_readied, a_wielded, a_worn, a_active, a_applied};
#define F_APPLIED 0x000F
@@ -265,6 +230,15 @@
uint32 val;
ber32 (uint32 val) : val (val) { }
+
+ static int encoded_size (uint32 val)
+ {
+ if (val >= (1 << 7*4)) return 5;
+ if (val >= (1 << 7*3)) return 4;
+ if (val >= (1 << 7*2)) return 3;
+ if (val >= (1 << 7*1)) return 2;
+ return 1;
+ }
};
/* Contains the base information we use to make up a packet we want to send. */