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.95 by root, Thu May 3 09:29:45 2007 UTC vs.
Revision 1.97 by root, Thu May 17 14:14:56 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
735rangetostring (player *pl, char *obuf) 735rangetostring (player *pl, char *obuf)
736{ 736{
737 dynbuf_text buf; 737 dynbuf_text buf;
738 738
739 if (pl->ranged_ob) 739 if (pl->ranged_ob)
740 buf << " Range: " << pl->ranged_ob->name; 740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741 741
742 if (pl->combat_ob) 742 if (pl->combat_ob)
743 buf << " Combat: " << pl->combat_ob->name; 743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
744 744
745 //TODO: maybe golem should become the current_weapon, quite simply?
745 if (pl->golem) 746 if (pl->golem)
746 buf << " Golem: " << pl->golem->name; 747 buf << " Golem*: " << pl->golem->name;
747 748
748 buf.linearise (obuf); 749 buf.linearise (obuf);
749 obuf [buf.size ()] = 0; 750 obuf [buf.size ()] = 0;
750} 751}
751 752

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines