--- deliantra/server/socket/request.C	2006/12/14 01:59:10	1.34
+++ deliantra/server/socket/request.C	2006/12/14 02:37:37	1.35
@@ -95,7 +95,7 @@
 };
 
 static void
-socket_map_scroll (NewSocket * ns, int dx, int dy)
+socket_map_scroll (client_socket * ns, int dx, int dy)
 {
   struct Map newmap;
   int x, y, mx, my;
@@ -155,7 +155,7 @@
 static void
 clear_map (player *pl)
 {
-  NewSocket & socket = pl->socket;
+  client_socket & socket = pl->socket;
 
   memset (&socket.lastmap, 0, sizeof (socket.lastmap));
 
@@ -170,7 +170,7 @@
 static void
 check_map_change (player *pl)
 {
-  NewSocket & socket = pl->socket;
+  client_socket & socket = pl->socket;
   object *ob = pl->ob;
   char buf[MAX_BUF];            /* eauugggh */
 
@@ -318,7 +318,7 @@
 
 /** This is the Setup cmd - easy first implementation */
 void
-SetUp (char *buf, int len, NewSocket * ns)
+SetUp (char *buf, int len, client_socket * ns)
 {
   int s, slen;
   char *cmd, *param, cmdback[HUGE_BUF];
@@ -538,7 +538,7 @@
  * it either has to be here or init_sockets needs to be exported.
  */
 void
-AddMeCmd (char *buf, int len, NewSocket * ns)
+AddMeCmd (char *buf, int len, client_socket * ns)
 {
   Settings oldsettings;
 
@@ -562,7 +562,7 @@
 
 /** Reply to ExtendedInfos command */
 void
-ToggleExtendedInfos (char *buf, int len, NewSocket * ns)
+ToggleExtendedInfos (char *buf, int len, client_socket * ns)
 {
   char cmdback[MAX_BUF];
   char command[50];
@@ -623,7 +623,7 @@
 
 /** Reply to ExtendedInfos command */
 void
-ToggleExtendedText (char *buf, int len, NewSocket * ns)
+ToggleExtendedText (char *buf, int len, client_socket * ns)
 {
   char cmdback[MAX_BUF];
   char temp[10];
@@ -684,7 +684,7 @@
  * client.
  */
 static void
-SendSmooth (NewSocket * ns, uint16 face)
+SendSmooth (client_socket * ns, uint16 face)
 {
   uint16 smoothface;
 
@@ -718,7 +718,7 @@
   * to smooth a picture number given as argument.
   */
 void
-AskSmooth (char *buf, int len, NewSocket * ns)
+AskSmooth (char *buf, int len, client_socket * ns)
 {
   uint16 facenbr;
 
@@ -920,7 +920,7 @@
  * problem.
  */
 void
-VersionCmd (char *buf, int len, NewSocket * ns)
+VersionCmd (char *buf, int len, client_socket * ns)
 {
   char *cp;
   char version_warning[256];
@@ -978,7 +978,7 @@
 /** sound related functions. */
 
 void
-SetSound (char *buf, int len, NewSocket * ns)
+SetSound (char *buf, int len, client_socket * ns)
 {
   ns->sound = atoi (buf);
 }
@@ -1046,7 +1046,7 @@
  * it needs to send something back (vs just printing out a message)
  */
 void
-send_query (NewSocket * ns, uint8 flags, char *text)
+send_query (client_socket * ns, uint8 flags, char *text)
 {
   char buf[MAX_BUF];
 
@@ -1215,7 +1215,7 @@
  * when the player logs in and picks stuff up.
  */
 void
-esrv_send_animation (NewSocket * ns, short anim_num)
+esrv_send_animation (client_socket * ns, short anim_num)
 {
   int i;
 
@@ -1262,7 +1262,7 @@
  * the face yet, we will also send it.
  */
 static void
-esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
+esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
 {
   if (newmap->cells[x][y].count >= MAP_LAYERS)
     {
@@ -1292,7 +1292,7 @@
 
 /** Checkes if map cells have changed */
 static int
-mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
+mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
 {
   int k;
 
@@ -1315,7 +1315,7 @@
  * how many layers of data we should back.
  */
 static uint8 *
-compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
+compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
 {
   int x, y, k;
   int face;
@@ -1433,7 +1433,7 @@
  * sent, it returns zero.
  */
 static int
-check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)
+check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
 {
   short face_num;
 
@@ -1477,7 +1477,7 @@
  */
 
 static int
-update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
+update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob, *head;
   uint16 face_num;
@@ -1700,7 +1700,7 @@
  */
 
 static inline int
-update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
+update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob;
   int smoothlevel;              /* old face_num; */
@@ -1744,7 +1744,7 @@
  * available.
  */
 int
-getExtendedMapInfoSize (NewSocket * ns)
+getExtendedMapInfoSize (client_socket * ns)
 {
   int result = 0;
 
@@ -1790,7 +1790,7 @@
   uint8 extendedinfos;
   maptile *m;
 
-  NewSocket &socket = pl->contr->socket;
+  client_socket &socket = pl->contr->socket;
 
   check_map_change (pl->contr);
 
@@ -2243,7 +2243,7 @@
  * the params - we always send the same info no matter what.
  */
 void
-send_skill_info (NewSocket *ns, char *params)
+send_skill_info (client_socket *ns, char *params)
 {
   packet sl;
   sl << "replyinfo skill_info\n";
@@ -2265,7 +2265,7 @@
  * the params - we always send the same info no matter what.
  */
 void
-send_spell_paths (NewSocket * ns, char *params)
+send_spell_paths (client_socket * ns, char *params)
 {
   packet sl;