--- deliantra/server/socket/image.C	2006/12/14 22:45:41	1.12
+++ 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;
 
@@ -314,18 +308,14 @@
  */
 
 void
-SetFaceMode (char *buf, int len, client_socket *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)
-    {
-      packet sl;
-      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, client_socket * ns)
+SendFaceCmd (char *buff, int len, client * ns)
 {
   long tmpnum = atoi (buff);
   short facenum = tmpnum & 0xffff;
@@ -357,7 +347,7 @@
  */
 
 void
-esrv_send_face (client_socket *ns, short face_num, int nocache)
+esrv_send_face (client *ns, short face_num, int nocache)
 {
   char fallback;
 
@@ -413,7 +403,7 @@
  */
 
 void
-send_image_info (client_socket * ns, char *params)
+send_image_info (client * ns, char *params)
 {
   packet sl;
 
@@ -438,7 +428,7 @@
  *  - name
  */
 void
-send_image_sums (client_socket * ns, char *params)
+send_image_sums (client * ns, char *params)
 {
   int start, stop;
   char *cp, buf[MAX_BUF];