ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.91 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.93 by root, Tue May 1 05:48:21 2007 UTC

736{ 736{
737 dynbuf_text buf; 737 dynbuf_text buf;
738 738
739 player *pl = ob->contr; 739 player *pl = ob->contr;
740 740
741 if (pl->ranged_skill)
742 {
743 buf.printf (" Range: %s", &pl->ranged_skill->name);
744
745 if (pl->ranged_ob) 741 if (pl->ranged_ob)
746 buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0)); 742 buf << " Range: " << pl->ranged_ob->name;
747 }
748 743
749 if (pl->combat_skill)
750 {
751 buf.printf (" Combat: %s", &pl->combat_skill->name);
752
753 if (pl->combat_ob) 744 if (pl->combat_ob)
754 buf.printf (" (%s)", query_base_name (pl->combat_ob, 0)); 745 buf << " Combat: " << pl->combat_ob->name;
755 }
756 746
757 if (pl->golem) 747 if (pl->golem)
758 buf.printf (" Golem: %s", &pl->golem->name); 748 buf << " Golem: " << pl->golem->name;
759 749
760 strcpy (obuf, buf.linearise () + 1); 750 if (buf.empty ())
751 *obuf = 0;
752 else
753 {
754 memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
755 obuf [buf.size ()] = 0;
756 }
761} 757}
762 758
763#define AddIfInt64(Old,New,Type) if (Old != New) {\ 759#define AddIfInt64(Old,New,Type) if (Old != New) {\
764 Old = New; \ 760 Old = New; \
765 sl << uint8 (Type) << uint64 (New); \ 761 sl << uint8 (Type) << uint64 (New); \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines