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.92 by root, Mon Apr 30 17:39:59 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines