--- deliantra/server/socket/info.C	2007/04/29 21:44:35	1.39
+++ deliantra/server/socket/info.C	2007/05/03 10:39:46	1.41
@@ -152,25 +152,23 @@
  *
  */
 void
-new_draw_info (int flags, int pri, const object *pl, const char *buf)
+new_draw_info (int flags, int pri, const object *op, const char *buf)
 {
   if (flags & NDI_ALL)
+    for_all_players (pl)
+      new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
+  else
     {
-      for_all_players (pl)
-        new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
-
-      return;
-    }
-
-  if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
-    return;
+      if (!op || !op->contr || !op->contr->ns)
+        return;
 
-  if (pri >= pl->contr->listening)
-    return;
+      if (pri >= op->contr->listening)
+        return;
 
-  if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
-      || !pl->contr->ns->msg_suppressed (buf))
-    print_message (flags & NDI_COLOR_MASK, pl, buf);
+      if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
+          || !op->contr->ns->msg_suppressed (buf))
+        print_message (flags & NDI_COLOR_MASK, op, buf);
+    }
 }
 
 /**
@@ -303,81 +301,6 @@
 }
 
 /**
- * Get player's current range attack in obuf.
- */
-void
-rangetostring (object *pl, char *obuf)
-{
-  switch (pl->contr->shoottype)
-    {
-      case range_bow:
-        for (object *op = pl->inv; op; op = op->below)
-          if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
-            {
-              sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? &op->race : "nothing");
-              return;
-            }
-
-        break;
-
-      case range_magic:
-        if (settings.casting_time == TRUE)
-          {
-            if (pl->casting_time > -1)
-              {
-                if (pl->casting_time == 0)
-                  sprintf (obuf, "Holding spell: %s", &pl->spell->name);
-                else
-                  sprintf (obuf, "Casting spell: %s", &pl->spell->name);
-              }
-            else
-              sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name);
-          }
-        else
-          sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name);
-
-        return;
-
-      case range_misc:
-        if (object *op = pl->contr->ranges[range_misc])
-          {
-            sprintf (obuf, "Item: %s", query_base_name (op, 0));
-            return;
-          }
-
-        break;
-
-        /* range_scroll is only used for controlling golems.  If the
-         * the player does not have a golem, reset some things.
-         */
-      case range_golem:
-        if (object *golem = pl->contr->ranges[range_golem])
-          {
-            sprintf (obuf, "Golem: %s", &golem->name);
-            return;
-          }
-
-        break;
-
-      case range_skill:
-        if (object *op = pl->chosen_skill)
-          {
-            sprintf (obuf, "Skill: %s", &op->name);
-            return;
-          }
-
-        break;
-
-      case range_builder:
-        sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
-        return;
-    }
-
-  pl->contr->shoottype = range_none;
-  strcpy (obuf, "Range: nothing");
-}
-
-/**
  * Sets player title.
  */
 void