--- deliantra/server/socket/request.C	2007/04/30 04:25:30	1.91
+++ deliantra/server/socket/request.C	2007/05/03 09:26:45	1.94
@@ -738,26 +738,17 @@
 
   player *pl = ob->contr;
 
-  if (pl->ranged_skill)
-    {
-      buf.printf (" Range: %s", &pl->ranged_skill->name);
-
-      if (pl->ranged_ob)
-        buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0));
-    }
-
-  if (pl->combat_skill)
-    {
-      buf.printf (" Combat: %s", &pl->combat_skill->name);
-
-      if (pl->combat_ob)
-        buf.printf (" (%s)", query_base_name (pl->combat_ob, 0));
-    }
+  if (pl->ranged_ob)
+    buf << " Range: "  << pl->ranged_ob->name;
+
+  if (pl->combat_ob)
+    buf << " Combat: " << pl->combat_ob->name;
 
   if (pl->golem)
-    buf.printf (" Golem: %s", &pl->golem->name);
+    buf << " Golem: "  << pl->golem->name;
 
-  strcpy (obuf, buf.linearise () + 1);
+  buf.linearise (obuf);
+  obuf [buf.size ()] = 0;
 }
 
 #define AddIfInt64(Old,New,Type) if (Old != New) {\