--- deliantra/server/socket/item.C	2007/03/01 12:28:17	1.40
+++ deliantra/server/socket/item.C	2007/03/14 00:04:59	1.42
@@ -266,16 +266,15 @@
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
 
-  if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE))
-    esrv_send_face (&ns, head->face->number, 0);
+  ns.send_face (head->face);
 
   if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
-    esrv_send_animation (&ns, head->animation_id);
+    ns.send_animation (head->animation_id);
 
   sl << uint32 (head->count)
      << uint32 (flags)
      << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
-     << uint32 (head->face->number);
+     << uint32 (head->face);
 
   if (!head->custom_name)
     {
@@ -358,8 +357,7 @@
 
   sl << uint32 (0);
 
-  if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
-    esrv_send_face (pl->contr->ns, empty_face->number, 0);
+  pl->contr->ns->send_face (empty_face);
 
   if (pl->contr->ns->look_position)
     {
@@ -369,7 +367,7 @@
       sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
          << uint32 (0)
          << sint32 (-1)
-         << uint32 (empty_face->number)
+         << uint32 (empty_face)
          << data8 (buf)
          << uint16 (0)
          << uint8  (0)
@@ -406,7 +404,7 @@
               sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
                  << uint32 (0)
                  << uint32 ((uint32) - 1)
-                 << uint32 (empty_face->number)
+                 << uint32 (empty_face)
                  << data8  ("Apply this to see next group of items")
                  << uint16 (0)
                  << uint8  (0)
@@ -557,10 +555,8 @@
 
   if (flags & UPD_FACE)
     {
-      if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
-        esrv_send_face (ns, op->face->number, 0);
-
-      sl << uint32 (op->face->number);
+      ns->send_face (op->face);
+      sl << uint32 (op->face);
     }
 
   if (flags & UPD_NAME)