--- deliantra/server/socket/info.C	2007/04/25 18:47:51	1.38
+++ deliantra/server/socket/info.C	2007/05/06 02:06:03	1.42
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -152,25 +152,25 @@
  *
  */
 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);
-
-      return;
     }
+  else
+    {
+      if (!op || !op->contr || !op->contr->ns)
+        return;
 
-  if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
-    return;
+      if (pri >= op->contr->listening)
+        return;
 
-  if (pri >= pl->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,80 +303,6 @@
 }
 
 /**
- * Get player's current range attack in obuf.
- */
-void
-rangetostring (object *pl, char *obuf)
-{
-  switch (pl->contr->shoottype)
-    {
-      case range_none:
-        strcpy (obuf, "Range: nothing");
-        break;
-
-      case range_bow:
-        {
-          object *op;
-
-          for (op = pl->inv; op; op = op->below)
-            if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
-              break;
-
-          if (op == NULL)
-            break;
-
-          sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
-        }
-        break;
-
-      case range_magic:
-        if (settings.casting_time == TRUE)
-          {
-            if (pl->casting_time > -1)
-              {
-                if (pl->casting_time == 0)
-                  sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
-                else
-                  sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
-              }
-            else
-              sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
-          }
-        else
-          sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
-        break;
-
-      case range_misc:
-        sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
-        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, "Range: golem (%s)", &golem->name);
-        else
-          {
-            pl->contr->shoottype = range_none;
-            strcpy (obuf, "Range: nothing");
-          }
-        break;
-
-      case range_skill:
-        sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
-        break;
-
-      case range_builder:
-        sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
-        break;
-
-      default:
-        strcpy (obuf, "Range: illegal");
-    }
-}
-
-/**
  * Sets player title.
  */
 void