--- deliantra/server/socket/image.C	2006/12/14 01:12:35	1.7
+++ deliantra/server/socket/image.C	2006/12/16 03:08:26	1.14
@@ -35,10 +35,6 @@
 #include <global.h>
 #include <sproto.h>
 
-#include <newclient.h>
-#include <newserver.h>
-#include <loader.h>
-
 #define MAX_FACE_SETS	20  /**< Maximum number of image sets the program will handle */
 
 /** Information about one image */
@@ -46,9 +42,7 @@
 {
 
   uint8 *data;              /**< image data */
-
   uint16 datalen;           /**< length of the xpm data */
-
   uint32 checksum;          /**< Checksum of face data */
 } FaceInfo;
 
@@ -231,12 +225,12 @@
               LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS);
               abort ();
             }
-          facesets[len].prefix = strdup_local (cps[1]);
-          facesets[len].fullname = strdup_local (cps[2]);
+          facesets[len].prefix = strdup (cps[1]);
+          facesets[len].fullname = strdup (cps[2]);
           facesets[len].fallback = atoi (cps[3]);
-          facesets[len].size = strdup_local (cps[4]);
-          facesets[len].extension = strdup_local (cps[5]);
-          facesets[len].comment = strdup_local (cps[6]);
+          facesets[len].size = strdup (cps[4]);
+          facesets[len].extension = strdup (cps[5]);
+          facesets[len].comment = strdup (cps[6]);
         }
     }
   close_and_delete (infile, compressed);
@@ -314,18 +308,14 @@
  */
 
 void
-SetFaceMode (char *buf, int len, NewSocket *ns)
+SetFaceMode (char *buf, int len, client *ns)
 {
   int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
 
   if (mode == CF_FACE_NONE)
     ns->facecache = 1;
   else if (mode != CF_FACE_PNG)
-    {
-      SockList sl (MAXSOCKBUF);
-      sl.printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode.  Will use Png");
-      ns->send_packet (sl);
-    }
+    ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode.  Will use Png");
 
   if (mask)
     ns->facecache = 1;
@@ -338,7 +328,7 @@
  */
 
 void
-SendFaceCmd (char *buff, int len, NewSocket * ns)
+SendFaceCmd (char *buff, int len, client * ns)
 {
   long tmpnum = atoi (buff);
   short facenum = tmpnum & 0xffff;
@@ -357,7 +347,7 @@
  */
 
 void
-esrv_send_face (NewSocket *ns, short face_num, int nocache)
+esrv_send_face (client *ns, short face_num, int nocache)
 {
   char fallback;
 
@@ -367,7 +357,7 @@
       return;
     }
 
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   fallback = get_face_fallback (ns->faceset, face_num);
 
   if (facesets[fallback].faces[face_num].data == NULL)
@@ -387,7 +377,7 @@
       sl << uint32 (facesets[fallback].faces[face_num].checksum)
          << new_faces[face_num].name;
 
-      Send_With_Handling (ns, &sl);
+      ns->send_packet (sl);
     }
   else
     {
@@ -400,11 +390,10 @@
       sl << uint32 (facesets[fallback].faces[face_num].datalen)
          << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
 
-      Send_With_Handling (ns, &sl);
+      ns->send_packet (sl);
     }
 
   ns->faces_sent[face_num] |= NS_FACESENT_FACE;
-  sl.free ();
 }
 
 /**
@@ -414,9 +403,9 @@
  */
 
 void
-send_image_info (NewSocket * ns, char *params)
+send_image_info (client * ns, char *params)
 {
-  SockList sl (MAXSOCKBUF);
+  packet sl;
 
   sl.printf ("replyinfo image_info\n%d\n%d\n", nrofpixmaps - 1, bmaps_checksum);
 
@@ -426,8 +415,7 @@
                  i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
                  facesets[i].size, facesets[i].extension, facesets[i].comment);
 
-  Send_With_Handling (ns, &sl);
-  sl.free ();
+  ns->send_packet (sl);
 }
 
 /**
@@ -440,12 +428,12 @@
  *  - name
  */
 void
-send_image_sums (NewSocket * ns, char *params)
+send_image_sums (client * ns, char *params)
 {
   int start, stop;
   char *cp, buf[MAX_BUF];
 
-  SockList sl (MAXSOCKBUF);
+  packet sl;
 
   start = atoi (params);
   for (cp = params; *cp != '\0'; cp++)
@@ -480,13 +468,12 @@
    * size to less than 1000, since that is what we claim the protocol would
    * support.
    */
-  if (sl.len >= MAXSOCKBUF)
+  if (sl.length () >= MAXSOCKBUF)
     {
-      LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.len, MAXSOCKBUF);
+      LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
       abort ();
     }
 
-  Send_With_Handling (ns, &sl);
-  sl.free ();
+  ns->send_packet (sl);
 }