--- deliantra/server/socket/item.C	2007/03/14 00:04:59	1.42
+++ deliantra/server/socket/item.C	2007/04/23 19:10:17	1.44
@@ -267,6 +267,7 @@
     flags |= F_NOPICK;
 
   ns.send_face (head->face);
+  ns.flush_fx ();
 
   if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
     ns.send_animation (head->animation_id);
@@ -358,6 +359,7 @@
   sl << uint32 (0);
 
   pl->contr->ns->send_face (empty_face);
+  pl->contr->ns->flush_fx ();
 
   if (pl->contr->ns->look_position)
     {
@@ -556,6 +558,7 @@
   if (flags & UPD_FACE)
     {
       ns->send_face (op->face);
+      ns->flush_fx ();
       sl << uint32 (op->face);
     }
 
@@ -690,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)
@@ -742,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)
@@ -836,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;
@@ -886,11 +905,9 @@
 
   dx = atoi (buf);
   if (!(cp = strchr (buf, ' ')))
-    {
-      return;
-    }
-  dy = atoi (cp);
+    return;
 
+  dy = atoi (cp);
   if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
     return;