--- deliantra/server/socket/item.C	2007/01/09 21:32:43	1.32
+++ deliantra/server/socket/item.C	2007/04/23 19:10:17	1.44
@@ -266,16 +266,16 @@
   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);
+  ns.flush_fx ();
 
   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)
     {
@@ -306,12 +306,12 @@
         anim_speed = head->anim_speed;
       else
         {
-          if (FABS (head->speed) < 0.001)
+          if (fabs (head->speed) < 0.001)
             anim_speed = 255;
-          else if (FABS (head->speed) >= 1.0)
+          else if (fabs (head->speed) >= 1.0)
             anim_speed = 1;
           else
-            anim_speed = (int) (1.0 / FABS (head->speed));
+            anim_speed = (int) (1.0 / fabs (head->speed));
         }
 
       if (anim_speed > 255)
@@ -336,11 +336,10 @@
 esrv_draw_look (object *pl)
 {
   int got_one = 0, start_look = 0, end_look = 0;
-  char buf[MAX_BUF];
 
   if (!pl->contr->ns->update_look)
     {
-      LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
+      LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
       return;
     }
   else
@@ -359,8 +358,8 @@
 
   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);
+  pl->contr->ns->flush_fx ();
 
   if (pl->contr->ns->look_position)
     {
@@ -370,7 +369,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)
@@ -407,7 +406,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)
@@ -450,6 +449,9 @@
 void
 esrv_send_inventory (object *pl, object *op)
 {
+  if (!pl->contr->ns)//D
+    return;
+
   int got_one = 0;
 
   pl->contr->ns->send_packet_printf ("delinv %d", op->count);
@@ -501,7 +503,6 @@
  * to the client (as defined in newclient.h - might as well use the
  * same value both places.
  */
-
 void
 esrv_update_item (int flags, object *pl, object *op)
 {
@@ -556,10 +557,9 @@
 
   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);
+      ns->flush_fx ();
+      sl << uint32 (op->face);
     }
 
   if (flags & UPD_NAME)
@@ -603,12 +603,12 @@
             anim_speed = op->anim_speed;
           else
             {
-              if (FABS (op->speed) < 0.001)
+              if (fabs (op->speed) < 0.001)
                 anim_speed = 255;
-              else if (FABS (op->speed) >= 1.0)
+              else if (fabs (op->speed) >= 1.0)
                 anim_speed = 1;
               else
-                anim_speed = (int) (1.0 / FABS (op->speed));
+                anim_speed = (int) (1.0 / fabs (op->speed));
             }
 
           if (anim_speed > 255)
@@ -630,6 +630,9 @@
 void
 esrv_send_item (object *pl, object *op)
 {
+  if (!pl->contr->ns)
+    return;
+
   /* If this is not the player object, do some more checks */
   if (op != pl)
     {
@@ -666,10 +669,12 @@
  * Tells the client to delete an item.  Uses the item
  * command with a -1 location.
  */
-
 void
 esrv_del_item (player *pl, int tag)
 {
+  if (!pl->ns)
+    return;
+
   packet sl ("delitem");
 
   sl << uint32 (tag);
@@ -688,47 +693,45 @@
  * Takes a player and object count (tag) and returns the actual object
  * pointer, or null if it can't be found.
  */
-
 object *
 esrv_get_ob_from_count (object *pl, tag_t count)
 {
-  object *op, *tmp;
-
   if (pl->count == count)
     return pl;
 
-  for (op = pl->inv; op; op = op->below)
+  for (object *op = pl->inv; op; op = op->below)
     if (op->count == count)
       return op;
     else if (op->type == CONTAINER && pl->container == op)
-      for (tmp = op->inv; tmp; tmp = tmp->below)
+      for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->count == count)
           return tmp;
 
-  for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
+  for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
     if (op->head && op->head->count == count)
       return op;
     else if (op->count == count)
       return op;
     else if (op->type == CONTAINER && pl->container == op)
-      for (tmp = op->inv; tmp; tmp = tmp->below)
+      for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->count == count)
           return tmp;
 
+#if 0
+  /* If the high bit is set, player examined a pseudo object. */
+  if (count & 0x80000000)
+    return 0;
+#endif
+
   return 0;
 }
 
-
 /** Client wants to examine some object.  So lets do so. */
 void
 ExamineCmd (char *buf, int len, player *pl)
 {
   tag_t tag = atoi (buf);
 
-  /* If the high bit is set, player examined a pseudo object. */
-  if (tag & 0x80000000)
-    return;
-
   object *op = esrv_get_ob_from_count (pl->ob, tag);
 
   if (!op)
@@ -740,6 +743,23 @@
   examine (pl->ob, op);
 }
 
+/** Client wants to examine some object.  So lets do so. */
+void
+ExCmd (char *buf, int len, player *pl)
+{
+  tag_t tag = atoi (buf);
+
+  if (object *op = esrv_get_ob_from_count (pl->ob, tag))
+    {
+      std::string s = op->describe (pl->ob);
+
+      packet sl ("ex");
+      sl << ber32 (tag) << s.c_str ();
+
+      pl->ns->send_packet (sl);
+    }
+}
+
 /** Client wants to apply some object. Lets do so. */
 void
 ApplyCmd (char *buf, int len, player *pl)
@@ -834,9 +854,10 @@
   if (!m)
     return;
 
-  for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
+  for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
+    ;
 
-  for (; tmp != NULL; tmp = tmp->below)
+  for (; tmp; tmp = tmp->below)
     {
       if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
         continue;
@@ -875,8 +896,6 @@
     }
 }
 
-
-
 /** Client wants to look at some object.  Lets do so. */
 void
 LookAt (char *buf, int len, player *pl)
@@ -886,12 +905,10 @@
 
   dx = atoi (buf);
   if (!(cp = strchr (buf, ' ')))
-    {
-      return;
-    }
-  dy = atoi (cp);
+    return;
 
-  if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
+  dy = atoi (cp);
+  if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
     return;
 
   if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])