--- deliantra/server/socket/request.C	2007/04/30 04:25:30	1.91
+++ deliantra/server/socket/request.C	2007/04/30 17:39:59	1.92
@@ -739,25 +739,24 @@
   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));
-    }
+    buf << " Range: "
+        << (pl->ranged_ob
+            ? pl->ranged_ob->name
+            : pl->ranged_skill->name);
 
   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));
-    }
+    buf << " Combat: "
+        << (pl->combat_ob
+            ? pl->combat_ob->name
+            : pl->combat_skill->name);
 
   if (pl->golem)
-    buf.printf (" Golem: %s", &pl->golem->name);
+    buf << " Golem: " << pl->golem->name;
 
-  strcpy (obuf, buf.linearise () + 1);
+  if (buf.empty ())
+    *obuf = 0;
+  else
+    memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
 }
 
 #define AddIfInt64(Old,New,Type) if (Old != New) {\