--- deliantra/server/socket/image.C	2012/11/11 04:29:11	1.72
+++ deliantra/server/socket/image.C	2012/11/11 05:53:12	1.73
@@ -22,11 +22,9 @@
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
-/** \file
+/*
  * Image related communication
  *
- *  \date 2003-12-02
- *
  * This file deals with the image related communication to the
  * client.  I've located all the functions in this file - this
  * localizes it more, and means that we don't need to declare
@@ -53,14 +51,19 @@
 
   //TODO: somehow fetch default priority from send_fx here
 
-  const facedata *d = face_data (idx, ns->faceset);
+  const faceinfo *f = face_info (idx);
 
-  if (!d)
+  if (!f)
     return; // doh
 
+  int set = ns->tileset;
+
+  if (f->face [set].chksum_len)
+    set = 0;
+
   /* cfperl_ix calls cf::face::ix which loads the data */
   /* and then calls cf::client::send_ix to actually queue the ix */
-  cfperl_ix (ns, idx, pri, d->size, d->fofs);
+  cfperl_ix (ns, set, idx, pri);
 }
 
 void
@@ -167,7 +170,7 @@
                      << uint8 (1) << uint8 (type);
                 }
 
-              const facedata *d = f->data (faceset);
+              const facedata *d = f->data (tileset);
 
               fx << ber32 (facenum)
                  << data8 (d->chksum, d->chksum_len);