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