[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.93 by root, Tue May 1 05:48:21 2007 UTC vs.
Revision 1.95 by root, Thu May 3 09:29:45 2007 UTC

 /**
  * Get player's current range attack in obuf.
  */
 static void
-rangetostring (object *ob, char *obuf)
+rangetostring (player *pl, char *obuf)
 {
   dynbuf_text buf;
-  player *pl = ob->contr;
   if (pl->ranged_ob)
     buf << " Range: "  << pl->ranged_ob->name;
   if (pl->combat_ob)
     buf << " Combat: " << pl->combat_ob->name;
   if (pl->golem)
     buf << " Golem: "  << pl->golem->name;
-  if (buf.empty ())
+  buf.linearise (obuf);
-    *obuf = 0;
-  else
-    {
-      memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
-      obuf [buf.size ()] = 0;
+  obuf [buf.size ()] = 0;
-    }
 }
 #define AddIfInt64(Old,New,Type) if (Old != New) {\
                         Old = New; \
                         sl << uint8 (Type) << uint64 (New); \
       AddIfInt (ns->last_path_attuned,  ob->path_attuned,  CS_STAT_SPELL_ATTUNE);
       AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
       AddIfInt (ns->last_path_denied,   ob->path_denied,   CS_STAT_SPELL_DENY);
     }
-  rangetostring (ob, buf);  /* we want use the new fire & run system in new client */
+  rangetostring (pl, buf);  /* we want use the new fire & run system in new client */
   AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
   set_title (ob, buf);
   AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
   /* Only send it away if we have some actual data */

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines