--- deliantra/server/include/global.h	2006/12/13 18:08:01	1.23
+++ deliantra/server/include/global.h	2006/12/18 03:00:02	1.30
@@ -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
@@ -39,8 +39,6 @@
 typedef int64_t		sint64;
 typedef uint64_t	uint64;
 
-typedef unsigned short Fontindex;
-
 #include "config.h"
 #include "define.h"
 #include "logger.h"
@@ -63,11 +61,12 @@
 #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"
-/* Include the basic defines from spells.h */
+
+#include "spells.h"
+
 #include "attack.h" /* needs to be before material.h */
 #include "material.h"
 #include "living.h"
@@ -78,7 +77,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"
@@ -112,9 +112,6 @@
 /* Now for recipe/alchemy */
 #include "recipe.h"
 
-/* Now for spells */
-#include "spells.h"
-
 #include "funcpoint.h"
 
 /*****************************************************************************
@@ -175,7 +172,7 @@
  */
 EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
 
-extern std::vector<Animations> animations;
+EXTERN std::vector<Animations> animations;
 EXTERN int num_animations,animations_allocated, bmaps_checksum;
 
 /* Rotate right from bsd sum. This is used in various places for checksumming */
@@ -202,7 +199,7 @@
 extern New_Face *dark_faces[];
 extern New_Face *smooth_face;
 
-extern NewSocket *init_sockets;
+extern client *init_sockets;
 
 #include "libproto.h"
 #include "sockproto.h"
@@ -247,7 +244,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 */