--- deliantra/server/include/global.h	2006/12/14 02:37:37	1.25
+++ deliantra/server/include/global.h	2006/12/18 02:35:01	1.29
@@ -18,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The author can be reached via e-mail to crossfire-devel@real-time.com
+    The author can be reached via e-mail to crossfire@schmorp.de
 */
 
 #ifndef GLOBAL_H
@@ -61,7 +61,6 @@
 #include "dynbuf.h"
 #include "util.h"
 #include "shstr.h"
-#include "newclient.h"
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
@@ -76,7 +75,8 @@
 #include "skills.h"
 
 /* Pull in the socket structure - used in the player structure */
-#include "newserver.h"
+#include "network.h"
+#include "client.h"
 
 /* Pull in the player structure */
 #include "player.h"
@@ -200,7 +200,7 @@
 extern New_Face *dark_faces[];
 extern New_Face *smooth_face;
 
-extern client_socket *init_sockets;
+extern client *init_sockets;
 
 #include "libproto.h"
 #include "sockproto.h"
@@ -245,7 +245,6 @@
   uint16  ACC (RW, set_friendly_fire);	/* Percent of damage done by peaceful player vs player damage */
   uint8   ACC (RW, casting_time);   /* it takes awhile to cast a spell */
   uint8   ACC (RW, real_wiz);       /* use mud-like wizards */
-  uint8   ACC (RW, recycle_tmp_maps); /* re-use tmp maps. */
   uint8   ACC (RW, explore_mode);     /* explore mode allowed? */
   uint8   ACC (RW, spellpoint_level_depend); /* spell costs go up with level */
   char    ACC (RW, motd)[MAX_BUF];    /* name of the motd file */