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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.38 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.39 by root, Tue Jul 10 05:51:37 2007 UTC

… …
491 * from stats.sp - b.t. 491 * from stats.sp - b.t.
492 */ 492 */
493const char * 493const char *
494ring_desc (const object *op) 494ring_desc (const object *op)
495{ 495{
496 static char buf[VERY_BIG_BUF]; 496 static dynbuf_text buf; buf.clear ();
497 int attr, val, len; 497 int attr, val, len;
498 498
499 buf[0] = 0;
500
501 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 499 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
502 return buf; 500 {
503
504 for (attr = 0; attr < NUM_STATS; attr++) 501 for (attr = 0; attr < NUM_STATS; attr++)
505 {
506 if ((val = op->stats.stat (attr))) 502 if ((val = op->stats.stat (attr)))
507 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 503 buf.printf ("(%s%+d)", short_stat_name[attr], val);
508 }
509 504
510 if (op->stats.exp) 505 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
511 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 506 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
512 if (op->stats.wc) 507 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
513 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 508 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
514 if (op->stats.dam)
515 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
516 if (op->stats.ac)
517 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
518 509
519 strcat (buf, describe_resistance (op, 0)); 510 buf << describe_resistance (op, 0);
520 511
521 if (op->stats.food != 0) 512 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
522 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 513 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
523 /* else if (op->stats.food < 0) 514 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
524 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 515 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
525 if (op->stats.grace) 516 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
526 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
527 if (op->stats.sp && op->type != SKILL)
528 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
529 if (op->stats.hp)
530 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
531 if (op->stats.luck)
532 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
533 if (QUERY_FLAG (op, FLAG_LIFESAVE))
534 strcat (buf, "(lifesaving)");
535 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
536 strcat (buf, "(reflect spells)");
537 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
538 strcat (buf, "(reflect missiles)");
539 if (QUERY_FLAG (op, FLAG_STEALTH))
540 strcat (buf, "(stealth)");
541 517
542 /* Shorten some of the names, so they appear better in the windows */ 518 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
543 len = strlen (buf); 519 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
544 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 520 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
545 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 521 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
546 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
547 522
548 /* if(op->item_power) 523 buf.add_paths ("Attuned" , op->path_attuned);
549 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 524 buf.add_paths ("Repelled", op->path_repelled);
550 */ 525 buf.add_paths ("Denied" , op->path_denied);
551 if (buf[0] == 0 && op->type != SKILL)
552 strcpy (buf, "of adornment");
553 526
527 if (buf.empty ())
528 buf << "of adornment";
529 }
554 530
555 return buf; 531 return buf;
556} 532}
557 533
558/* 534/*
… …
560 * contain any information about object status (worn/cursed/etc.) 536 * contain any information about object status (worn/cursed/etc.)
561 */ 537 */
562const char * 538const char *
563query_short_name (const object *op) 539query_short_name (const object *op)
564{ 540{
565 static char buf[HUGE_BUF]; 541 static dynbuf_text buf; buf.clear ();
566 char buf2[HUGE_BUF];
567 int len = 0;
568 542
569 if (op->name == NULL) 543 if (op->name == NULL)
570 return "(null)"; 544 return "(null)";
571 545
572 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 546 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
573 return op->name; /* To speed things up (or make things slower?) */ 547 return op->name; /* To speed things up (or make things slower?) */
574 548
575 if (op->nrof <= 1) 549 buf << (op->nrof <= 1 ? op->name : op->name_pl);
576 safe_strcat (buf, op->name, &len, HUGE_BUF);
577 else
578 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
579 550
580 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 551 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
581 { 552 buf << ' ' << op->title;
582 safe_strcat (buf, " ", &len, HUGE_BUF);
583 safe_strcat (buf, op->title, &len, HUGE_BUF);
584 }
585 553
586 switch (op->type) 554 switch (op->type)
587 { 555 {
588 case SPELLBOOK: 556 case SPELLBOOK:
589 case SCROLL: 557 case SCROLL:
590 case WAND: 558 case WAND:
591 case ROD: 559 case ROD:
592 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 560 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
593 { 561 {
594 if (!op->title) 562 if (!op->title)
595 { 563 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
596 safe_strcat (buf, " of ", &len, HUGE_BUF); 564
597 if (op->inv)
598 safe_strcat (buf, op->inv->name, &len, HUGE_BUF);
599 else
600 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
601 }
602 if (op->type != SPELLBOOK) 565 if (op->type != SPELLBOOK)
603 {
604 sprintf (buf2, " (lvl %d)", op->level); 566 buf.printf (" (lvl %d)", op->level);
605 safe_strcat (buf, buf2, &len, HUGE_BUF);
606 }
607 } 567 }
608 break; 568 break;
609 569
610 case SKILL: 570 case SKILL:
611 case AMULET: 571 case AMULET:
612 case RING: 572 case RING:
613 if (!op->title) 573 if (!op->title)
614 { 574 {
615 /* If ring has a title, full description isn't so useful */ 575 /* If ring has a title, full description isn't so useful */
616 const char *s = ring_desc (op); 576 const char *s = ring_desc (op);
617 577
618 if (s[0]) 578 if (s && *s)
619 { 579 buf << " " << s;
620 safe_strcat (buf, " ", &len, HUGE_BUF);
621 safe_strcat (buf, s, &len, HUGE_BUF);
622 }
623 } 580 }
624 break; 581 break;
625 default: 582 default:
626 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 583 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
627 {
628 sprintf (buf2, " %+d", op->magic); 584 buf.printf (" %+d", op->magic);
629 safe_strcat (buf, buf2, &len, HUGE_BUF);
630 }
631 } 585 }
586
632 return buf; 587 return buf;
633} 588}
634 589
635/* 590/*
636 * query_name(object) returns a character pointer pointing to a static 591 * query_name(object) returns a character pointer pointing to a static
… …
644 * 599 *
645 */ 600 */
646const char * 601const char *
647query_name (const object *op) 602query_name (const object *op)
648{ 603{
649 static char buf[5][HUGE_BUF]; // OMFG 604 int len = 0;
605 static dynbuf_text bufs[5];
650 static int use_buf = 0; 606 static int use_buf = 0;
651 int len = 0;
652
653#ifdef NEW_MATERIAL_CODE
654 materialtype_t *mt;
655#endif
656 607
657 use_buf++; 608 use_buf++;
658 use_buf %= 5; 609 use_buf %= 5;
659 610
660#ifdef NEW_MATERIAL_CODE 611 dynbuf_text &buf = bufs [use_buf];
612 buf.clear ();
613
661 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 614 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
662 {
663 mt = name_to_material (op->materialname); 615 if (materialtype_t *mt = name_to_material (op->materialname))
664 if (mt) 616 buf << mt->description << ' ';
665 {
666 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
667 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
668 }
669 }
670#endif
671 617
672 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 618 buf << query_short_name (op);
673 619
674 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 620 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
675 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 621 buf << " *";
676 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 622 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
677 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 623 buf << " (open)";
678 624
679 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 625 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
680 { 626 {
681 if (QUERY_FLAG (op, FLAG_DAMNED)) 627 if (QUERY_FLAG (op, FLAG_DAMNED))
682 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 628 buf << " (damned)";
683 else if (QUERY_FLAG (op, FLAG_CURSED)) 629 else if (QUERY_FLAG (op, FLAG_CURSED))
684 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 630 buf << " (cursed)";
685 } 631 }
686 632
687 /* Basically, if the object is known magical (detect magic spell on it), 633 /* Basically, if the object is known magical (detect magic spell on it),
688 * and it isn't identified, print out the fact that 634 * and it isn't identified, print out the fact that
689 * it is magical. Assume that the detect magical spell will only set 635 * it is magical. Assume that the detect magical spell will only set
… …
692 * Changed in V 0.91.4 - still print that the object is magical even 638 * Changed in V 0.91.4 - still print that the object is magical even
693 * if it has been applied. Equipping an item does not tell full 639 * if it has been applied. Equipping an item does not tell full
694 * abilities, especially for artifact items. 640 * abilities, especially for artifact items.
695 */ 641 */
696 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 642 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
697 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 643 buf << " (magic)";
698 644
699#if 0 645#if 0
700 /* item_power will be returned in desribe_item - it shouldn't really 646 /* item_power will be returned in desribe_item - it shouldn't really
701 * be returned in the name. 647 * be returned in the name.
702 */ 648 */
… …
711 { 657 {
712 case BOW: 658 case BOW:
713 case WAND: 659 case WAND:
714 case ROD: 660 case ROD:
715 case HORN: 661 case HORN:
716 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF); 662 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
717 break; 663 break;
718 case WEAPON: 664 case WEAPON:
719 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF); 665 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
720 break; 666 break;
721 case ARMOUR: 667 case ARMOUR:
722 case HELMET: 668 case HELMET:
723 case SHIELD: 669 case SHIELD:
724 case RING: 670 case RING:
… …
726 case GLOVES: 672 case GLOVES:
727 case AMULET: 673 case AMULET:
728 case GIRDLE: 674 case GIRDLE:
729 case BRACERS: 675 case BRACERS:
730 case CLOAK: 676 case CLOAK:
731 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 677 buf << " (worn)";
732 break; 678 break;
733 case CONTAINER: 679 case CONTAINER:
734 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 680 buf << " (active)";
735 break; 681 break;
736 case SKILL: 682 case SKILL:
737 default: 683 default:
738 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 684 buf << " (applied)";
739 } 685 }
740 } 686 }
741 687
742 if (QUERY_FLAG (op, FLAG_UNPAID)) 688 if (QUERY_FLAG (op, FLAG_UNPAID))
743 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 689 buf << " (unpaid)";
744 690
745 return buf [use_buf]; 691 return buf;
746} 692}
747 693
748/* 694/*
749 * query_base_name(object) returns a character pointer pointing to a static 695 * query_base_name(object) returns a character pointer pointing to a static
750 * buffer which contains a verbose textual representation of the name 696 * buffer which contains a verbose textual representation of the name
… …
755 * If plural is set, we generate the plural name of this. 701 * If plural is set, we generate the plural name of this.
756 */ 702 */
757const char * 703const char *
758query_base_name (const object *op, int plural) 704query_base_name (const object *op, int plural)
759{ 705{
760 static char buf[MAX_BUF], buf2[MAX_BUF];
761 int len;
762 materialtype_t *mt;
763
764 if ((!plural && !op->name) || (plural && !op->name_pl)) 706 if ((!plural && !op->name) || (plural && !op->name_pl))
765 return "(null)"; 707 return "(null)";
766 708
767 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 709 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
768 return op->name; /* To speed things up (or make things slower?) */ 710 return op->name; /* To speed things up (or make things slower?) */
769 711
712 static dynbuf_text buf; buf.clear ();
713
770 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 714 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
771 mt = name_to_material (op->materialname); 715 if (materialtype_t *mt = name_to_material (op->materialname))
716 if (op->arch->materialname != mt->name)
717 buf << mt->description << ' ';
772 718
773#ifdef NEW_MATERIAL_CODE 719 buf << (plural ? op->name_pl : op->name);
774 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
775 op->arch->materialname != mt->name && !(op->material & M_SPECIAL))
776 {
777 strcpy (buf, mt->description);
778 len = strlen (buf);
779 safe_strcat (buf, " ", &len, MAX_BUF);
780 if (!plural)
781 safe_strcat (buf, op->name, &len, MAX_BUF);
782 else
783 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
784 }
785 else
786 {
787#endif
788 if (!plural)
789 assign (buf, op->name);
790 else
791 assign (buf, op->name_pl);
792
793 len = strlen (buf);
794#ifdef NEW_MATERIAL_CODE
795 }
796#endif
797 720
798 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 721 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
799 { 722 buf << ' ' << op->title;
800 safe_strcat (buf, " ", &len, MAX_BUF);
801 safe_strcat (buf, op->title, &len, MAX_BUF);
802 }
803 723
804 switch (op->type) 724 switch (op->type)
805 { 725 {
806 case SPELLBOOK: 726 case SPELLBOOK:
807 case SCROLL: 727 case SCROLL:
808 case WAND: 728 case WAND:
809 case ROD: 729 case ROD:
810 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 730 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
811 { 731 {
812 if (!op->title) 732 if (!op->title)
813 { 733 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
814 safe_strcat (buf, " of ", &len, MAX_BUF); 734
815 if (op->inv)
816 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
817 else
818 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
819 }
820 if (op->type != SPELLBOOK) 735 if (op->type != SPELLBOOK)
821 {
822 sprintf (buf2, " (lvl %d)", op->level); 736 buf.printf (" (lvl %d)", op->level);
823 safe_strcat (buf, buf2, &len, MAX_BUF);
824 }
825 } 737 }
826 break; 738 break;
827 739
828 740
829 case SKILL: 741 case SKILL:
… …
832 if (!op->title) 744 if (!op->title)
833 { 745 {
834 /* If ring has a title, full description isn't so useful */ 746 /* If ring has a title, full description isn't so useful */
835 const char *s = ring_desc (op); 747 const char *s = ring_desc (op);
836 748
837 if (s[0]) 749 if (s && *s)
838 { 750 buf << ' ' << s;
839 safe_strcat (buf, " ", &len, MAX_BUF);
840 safe_strcat (buf, s, &len, MAX_BUF);
841 }
842 } 751 }
843 break; 752 break;
844 753
845 default: 754 default:
846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 755 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
847 sprintf (buf + strlen (buf), " %+d", op->magic); 756 buf.printf (" %+d", op->magic);
848 } 757 }
849 758
850 return buf; 759 return buf;
851} 760}
852 761
… …
854 * too long, making it difficult to read. This function deals 763 * too long, making it difficult to read. This function deals
855 * with describing the monsters & players abilities. It should only 764 * with describing the monsters & players abilities. It should only
856 * be called with monster & player objects. Returns a description 765 * be called with monster & player objects. Returns a description
857 * in a static buffer. 766 * in a static buffer.
858 */ 767 */
859static char * 768static const char *
860describe_monster (const object *op) 769describe_monster (const object *op)
861{ 770{
862 char buf[MAX_BUF]; 771 static dynbuf_text buf; buf.clear ();
863 static char retbuf[VERY_BIG_BUF];
864 int i;
865
866 retbuf[0] = '\0';
867 772
868 /* Note that the resolution this provides for players really isn't 773 /* Note that the resolution this provides for players really isn't
869 * very good. Any player with a speed greater than .67 will 774 * very good. Any player with a speed greater than .67 will
870 * fall into the 'lightning fast movement' category. 775 * fall into the 'lightning fast movement' category.
871 */ 776 */
872 if (op->has_active_speed ()) 777 if (op->has_active_speed ())
873 {
874 switch ((int) ((FABS (op->speed)) * 15)) 778 switch ((int) ((FABS (op->speed)) * 15))
875 { 779 {
876 case 0: 780 case 0:
877 strcat (retbuf, "(very slow movement)"); 781 buf << "(very slow movement";
878 break; 782 break;
879 case 1: 783 case 1:
880 strcat (retbuf, "(slow movement)"); 784 buf << "(slow movement)";
881 break; 785 break;
882 case 2: 786 case 2:
883 strcat (retbuf, "(normal movement)"); 787 buf << "(normal movement)";
884 break; 788 break;
885 case 3: 789 case 3:
886 case 4: 790 case 4:
887 strcat (retbuf, "(fast movement)"); 791 buf << "(fast movement)";
888 break; 792 break;
889 case 5: 793 case 5:
890 case 6: 794 case 6:
891 strcat (retbuf, "(very fast movement)"); 795 buf << "(very fast movement)";
892 break; 796 break;
893 case 7: 797 case 7:
894 case 8: 798 case 8:
895 case 9: 799 case 9:
896 case 10: 800 case 10:
897 strcat (retbuf, "(extremely fast movement)"); 801 buf << "(extremely fast movement)";
898 break; 802 break;
899 default: 803 default:
900 strcat (retbuf, "(lightning fast movement)"); 804 buf << "(lightning fast movement)";
901 break; 805 break;
902 } 806 }
903 } 807
904 if (QUERY_FLAG (op, FLAG_UNDEAD)) 808 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";
905 strcat (retbuf, "(undead)");
906 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 809 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";
907 strcat (retbuf, "(see invisible)"); 810 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";
908 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 811 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";
909 strcat (retbuf, "(wield weapon)"); 812 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";
910 if (QUERY_FLAG (op, FLAG_USE_BOW)) 813 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";
911 strcat (retbuf, "(archer)"); 814 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";
912 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 815 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";
913 strcat (retbuf, "(wear armour)");
914 if (QUERY_FLAG (op, FLAG_USE_RING))
915 strcat (retbuf, "(wear ring)");
916 if (QUERY_FLAG (op, FLAG_USE_SCROLL))
917 strcat (retbuf, "(read scroll)");
918 if (QUERY_FLAG (op, FLAG_USE_RANGE))
919 strcat (retbuf, "(fires wand/rod/horn)");
920 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) 816 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";
921 strcat (retbuf, "(skill user)"); 817 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";
922 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) 818 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";
923 strcat (retbuf, "(spellcaster)");
924 if (QUERY_FLAG (op, FLAG_FRIENDLY))
925 strcat (retbuf, "(friendly)");
926 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) 819 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";
927 strcat (retbuf, "(unaggressive)"); 820 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";
928 if (QUERY_FLAG (op, FLAG_HITBACK)) 821 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";
929 strcat (retbuf, "(hitback)"); 822
930 if (QUERY_FLAG (op, FLAG_STEALTH))
931 strcat (retbuf, "(stealthy)");
932 if (op->randomitems != NULL) 823 if (op->randomitems)
933 { 824 {
934 treasure *t;
935 int first = 1; 825 bool first = 1;
936 826
937 for (t = op->randomitems->items; t != NULL; t = t->next) 827 for (treasure *t = op->randomitems->items; t; t = t->next)
938 if (t->item && t->item->type == SPELL) 828 if (t->item && t->item->type == SPELL)
939 { 829 {
940 if (first) 830 if (first)
941 { 831 buf << "(Spell abilities:)";
832
942 first = 0; 833 first = 0;
943 strcat (retbuf, "(Spell abilities:)"); 834
944 } 835 buf << '(' << t->item->object::name << ')';
945 strcat (retbuf, "(");
946 strcat (retbuf, t->item->object::name);
947 strcat (retbuf, ")");
948 } 836 }
949 } 837 }
838
950 if (op->type == PLAYER) 839 if (op->type == PLAYER)
951 { 840 {
952 if (op->contr->digestion) 841 if (op->contr->digestion)
953 {
954 if (op->contr->digestion != 0)
955 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 842 buf.printf ("(sustenance%+d)", op->contr->digestion);
956 strcat (retbuf, buf); 843
957 }
958 if (op->contr->gen_grace) 844 if (op->contr->gen_grace)
959 {
960 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 845 buf.printf ("(grace%+d)", op->contr->gen_grace);
961 strcat (retbuf, buf); 846
962 }
963 if (op->contr->gen_sp) 847 if (op->contr->gen_sp)
964 {
965 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 848 buf.printf ("(magic%+d)", op->contr->gen_sp);
966 strcat (retbuf, buf); 849
967 }
968 if (op->contr->gen_hp) 850 if (op->contr->gen_hp)
969 {
970 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 851 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
971 strcat (retbuf, buf); 852
972 }
973 if (op->stats.luck) 853 if (op->stats.luck)
974 {
975 sprintf (buf, "(luck%+d)", op->stats.luck); 854 buf.printf ("(luck%+d)", op->stats.luck);
976 strcat (retbuf, buf);
977 }
978 } 855 }
979 856
980 /* describe attacktypes */ 857 /* describe attacktypes */
981 if (is_dragon_pl (op)) 858 if (is_dragon_pl (op))
982 { 859 {
… …
984 * Break apart the for loop - move the comparison checking down - 861 * Break apart the for loop - move the comparison checking down -
985 * this makes it more readable. 862 * this makes it more readable.
986 */ 863 */
987 object *tmp; 864 object *tmp;
988 865
989 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 866 for (tmp = op->inv; tmp; tmp = tmp->below)
990 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 867 if (tmp->type == SKILL && tmp->name == shstr_clawing)
991 break; 868 break;
992 869
993 if (tmp && tmp->attacktype != 0) 870 if (tmp && tmp->attacktype)
994 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") } 871 buf.add_abilities ("Claws", tmp->attacktype);
995 else 872 else
996 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 873 buf.add_abilities ("Attacks", op->attacktype);
997 } 874 }
998 else 875 else
999 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 876 buf.add_abilities ("Attacks", op->attacktype);
1000 877
1001 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 878 buf.add_paths ("Attuned" , op->path_attuned);
1002 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 879 buf.add_paths ("Repelled", op->path_repelled);
1003 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 880 buf.add_paths ("Denied" , op->path_denied);
1004 881
1005 for (i = 0; i < NROFATTACKS; i++) 882 for (int i = 0; i < NROFATTACKS; i++)
1006 if (op->resist[i]) 883 if (op->resist[i])
1007 {
1008 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 884 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1009 strcat (retbuf, buf);
1010 }
1011 885
1012 return retbuf; 886 return buf;
1013} 887}
1014
1015 888
1016/* 889/*
1017 * Returns a pointer to a static buffer which contains a 890 * Returns a pointer to a static buffer which contains a
1018 * description of the given object. 891 * description of the given object.
1019 * If it is a monster, lots of information about its abilities 892 * If it is a monster, lots of information about its abilities
… …
1040 * item (eg, debug dump or the like) 913 * item (eg, debug dump or the like)
1041 */ 914 */
1042const char * 915const char *
1043describe_item (const object *op, object *owner) 916describe_item (const object *op, object *owner)
1044{ 917{
1045 char buf[MAX_BUF]; 918 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1046 static char retbuf[VERY_BIG_BUF]; 919 return describe_monster (op);
920
921 static dynbuf_text buf; buf.clear ();
1047 int identified, i; 922 int identified, i;
1048 923
1049 retbuf[0] = '\0';
1050 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1051 {
1052 return describe_monster (op);
1053 }
1054 /* figure this out once, instead of making multiple calls to need_identify. 924 /* figure this out once, instead of making multiple calls to need_identify.
1055 * also makes the code easier to read. 925 * also makes the code easier to read.
1056 */ 926 */
1057 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 927 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED);
1058 identified = 1; 928 if (!identified)
1059 else 929 buf << "(unidentified)";
1060 { 930
1061 strcpy (retbuf, "(unidentified)");
1062 identified = 0;
1063 }
1064 switch (op->type) 931 switch (op->type)
1065 { 932 {
1066 case BOW: 933 case BOW:
1067 case ARROW: 934 case ARROW:
1068 case WAND: 935 case WAND:
1069 case ROD: 936 case ROD:
1070 case HORN: 937 case HORN:
1071 case WEAPON: 938 case WEAPON:
1072 case ARMOUR: 939 case ARMOUR:
1073 case HELMET: 940 case HELMET:
1074 case SHIELD: 941 case SHIELD:
1075 case BOOTS: 942 case BOOTS:
1076 case GLOVES: 943 case GLOVES:
1077 case GIRDLE: 944 case GIRDLE:
1078 case BRACERS: 945 case BRACERS:
1079 case CLOAK: 946 case CLOAK:
1080 case SKILL_TOOL: 947 case SKILL_TOOL:
1081 break; /* We have more information to do below this switch */ 948 break; /* We have more information to do below this switch */
1082 949
1083 case POWER_CRYSTAL: 950 case POWER_CRYSTAL:
1084 if (op->stats.maxsp > 1000) 951 if (op->stats.maxsp > 1000)
1085 { /*higher capacity crystals */ 952 { /*higher capacity crystals */
1086 i = (op->stats.maxsp % 1000) / 100; 953 i = (op->stats.maxsp % 1000) / 100;
1087 954
1088 if (i) 955 if (i)
1089 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 956 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1090 else 957 else
1091 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000); 958 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);
1092 } 959 }
1093 else 960 else
1094 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 961 buf.printf ("(capacity %d). It is ", op->stats.maxsp);
1095 962
1096 strcat (retbuf, buf);
1097 i = (op->stats.sp * 10) / op->stats.maxsp; 963 i = (op->stats.sp * 10) / op->stats.maxsp;
1098 if (op->stats.sp == 0) 964 if (op->stats.sp == 0)
1099 strcat (retbuf, "empty."); 965 buf << "empty.";
1100 else if (i == 0) 966 else if (i == 0)
1101 strcat (retbuf, "almost empty."); 967 buf << "almost empty.";
1102 else if (i < 3) 968 else if (i < 3)
1103 strcat (retbuf, "partially filled."); 969 buf << "partially filled.";
1104 else if (i < 6) 970 else if (i < 6)
1105 strcat (retbuf, "half full."); 971 buf << "half full.";
1106 else if (i < 9) 972 else if (i < 9)
1107 strcat (retbuf, "well charged."); 973 buf << "well charged.";
1108 else if (op->stats.sp == op->stats.maxsp) 974 else if (op->stats.sp == op->stats.maxsp)
1109 strcat (retbuf, "fully charged."); 975 buf << "fully charged.";
1110 else 976 else
1111 strcat (retbuf, "almost full."); 977 buf << "almost full.";
1112 break; 978 break;
979
1113 case FOOD: 980 case FOOD:
1114 case FLESH: 981 case FLESH:
1115 case DRINK: 982 case DRINK:
1116 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 983 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1117 { 984 {
1118 sprintf (buf, "(food+%d)", op->stats.food); 985 buf.printf ("(food+%d)", op->stats.food);
1119 strcat (retbuf, buf);
1120 986
1121 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 987 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1122 {
1123 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 988 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1124 strcat (retbuf, buf);
1125 }
1126 989
1127 if (!QUERY_FLAG (op, FLAG_CURSED)) 990 if (!QUERY_FLAG (op, FLAG_CURSED))
1128 { 991 {
1129 if (op->stats.hp) 992 if (op->stats.hp) buf << "(heals)";
1130 strcat (retbuf, "(heals)");
1131 if (op->stats.sp)
1132 strcat (retbuf, "(spellpoint regen)"); 993 if (op->stats.sp) buf << "(spellpoint regen)";
1133 } 994 }
1134 else 995 else
1135 { 996 {
1136 if (op->stats.hp) 997 if (op->stats.hp) buf << "(damages)";
1137 strcat (retbuf, "(damages)");
1138 if (op->stats.sp)
1139 strcat (retbuf, "(spellpoint depletion)"); 998 if (op->stats.sp) buf << "(spellpoint depletion)";
1140 } 999 }
1141 } 1000 }
1142 break; 1001 break;
1143 1002
1144
1145 case SKILL: 1003 case SKILL:
1146 case RING: 1004 case RING:
1147 case AMULET: 1005 case AMULET:
1148 if (op->item_power) 1006 if (op->item_power)
1149 {
1150 sprintf (buf, "(item_power %+d)", op->item_power); 1007 buf.printf ("(item_power %+d)", op->item_power);
1151 strcat (retbuf, buf); 1008
1152 }
1153 if (op->title) 1009 if (op->title)
1154 strcat (retbuf, ring_desc (op)); 1010 buf << ring_desc (op);
1011
1155 return retbuf; 1012 return buf;
1156 1013
1157 default: 1014 default:
1158 return retbuf; 1015 return buf;
1159 } 1016 }
1160 1017
1161 /* Down here, we more further describe equipment type items. 1018 /* Down here, we more further describe equipment type items.
1162 * only describe them if they have been identified or the like. 1019 * only describe them if they have been identified or the like.
1163 */ 1020 */
1164 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1021 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1165 { 1022 {
1166 int attr, val; 1023 int attr, val;
1167 1024
1168 for (attr = 0; attr < NUM_STATS; attr++) 1025 for (attr = 0; attr < NUM_STATS; attr++)
1169 {
1170 if ((val = op->stats.stat (attr))) 1026 if ((val = op->stats.stat (attr)))
1171 {
1172 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1027 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1173 strcat (retbuf, buf);
1174 }
1175 }
1176 1028
1177 if (op->stats.exp) 1029 if (op->stats.exp)
1178 {
1179 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1030 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1180 strcat (retbuf, buf);
1181 }
1182
1183 1031
1184 switch (op->type) 1032 switch (op->type)
1185 { 1033 {
1186 case BOW: 1034 case BOW:
1187 case ARROW: 1035 case ARROW:
1188 case GIRDLE: 1036 case GIRDLE:
1189 case HELMET: 1037 case HELMET:
1190 case SHIELD: 1038 case SHIELD:
1191 case BOOTS: 1039 case BOOTS:
1192 case GLOVES: 1040 case GLOVES:
1193 case WEAPON: 1041 case WEAPON:
1194 case SKILL: 1042 case SKILL:
1195 case RING: 1043 case RING:
1196 case AMULET: 1044 case AMULET:
1197 case ARMOUR: 1045 case ARMOUR:
1198 case BRACERS: 1046 case BRACERS:
1199 case FORCE: 1047 case FORCE:
1200 case CLOAK: 1048 case CLOAK:
1201 if (op->stats.wc) 1049 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1202 { 1050 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1203 sprintf (buf, "(wc%+d)", op->stats.wc); 1051 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1204 strcat (retbuf, buf); 1052
1205 }
1206 if (op->stats.dam)
1207 {
1208 sprintf (buf, "(dam%+d)", op->stats.dam);
1209 strcat (retbuf, buf);
1210 }
1211 if (op->stats.ac)
1212 {
1213 sprintf (buf, "(ac%+d)", op->stats.ac);
1214 strcat (retbuf, buf);
1215 }
1216 if ((op->type == WEAPON || op->type == BOW) && op->level > 0) 1053 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1217 {
1218 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1054 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1219 strcat (retbuf, buf); 1055
1220 }
1221 break; 1056 break;
1222 1057
1223 default: 1058 default:
1224 break; 1059 break;
1225 } 1060 }
1226 if (QUERY_FLAG (op, FLAG_XRAYS)) 1061
1227 strcat (retbuf, "(xray-vision)"); 1062 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";
1228 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1063 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";
1229 strcat (retbuf, "(infravision)");
1230 1064
1231 /* levitate was what is was before, so we'll keep it */ 1065 /* levitate was what is was before, so we'll keep it */
1232 if (op->move_type & MOVE_FLY_LOW) 1066 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1233 strcat (retbuf, "(levitate)");
1234
1235 if (op->move_type & MOVE_FLY_HIGH) 1067 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1236 strcat (retbuf, "(fly)");
1237
1238 if (op->move_type & MOVE_SWIM) 1068 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1239 strcat (retbuf, "(swim)");
1240 1069
1241 /* walking is presumed as 'normal', so doesn't need mentioning */ 1070 /* walking is presumed as 'normal', so doesn't need mentioning */
1242 1071
1243 if (op->item_power) 1072 if (op->item_power)
1244 {
1245 sprintf (buf, "(item_power %+d)", op->item_power); 1073 buf.printf ("(item_power %+d)", op->item_power);
1246 strcat (retbuf, buf);
1247 }
1248 } /* End if identified or applied */ 1074 } /* End if identified or applied */
1249 1075
1250 /* This blocks only deals with fully identified object. 1076 /* This blocks only deals with fully identified object.
1251 * it is intentional that this is not an 'else' from a above - 1077 * it is intentional that this is not an 'else' from a above -
1252 * in this way, information is added. 1078 * in this way, information is added.
… …
1255 { 1081 {
1256 int more_info = 0; 1082 int more_info = 0;
1257 1083
1258 switch (op->type) 1084 switch (op->type)
1259 { 1085 {
1260 case ROD: /* These use stats.sp for spell selection and stats.food */ 1086 case ROD: /* These use stats.sp for spell selection and stats.food */
1261 case HORN: /* and stats.hp for spell-point regeneration... */ 1087 case HORN: /* and stats.hp for spell-point regeneration... */
1262 case BOW: 1088 case BOW:
1263 case ARROW: 1089 case ARROW:
1264 case WAND: 1090 case WAND:
1265 case FOOD: 1091 case FOOD:
1266 case FLESH: 1092 case FLESH:
1267 case DRINK: 1093 case DRINK:
1268 more_info = 0; 1094 more_info = 0;
1269 break; 1095 break;
1270 1096
1271 /* Armor type objects */ 1097 /* Armor type objects */
1272 case ARMOUR: 1098 case ARMOUR:
1273 case HELMET: 1099 case HELMET:
1274 case SHIELD: 1100 case SHIELD:
1275 case BOOTS: 1101 case BOOTS:
1276 case GLOVES: 1102 case GLOVES:
1277 case GIRDLE: 1103 case GIRDLE:
1278 case BRACERS: 1104 case BRACERS:
1279 case CLOAK: 1105 case CLOAK:
1280 if (ARMOUR_SPEED (op)) 1106 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1281 { 1107 if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1282 sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1283 strcat (retbuf, buf);
1284 }
1285 if (ARMOUR_SPELLS (op))
1286 {
1287 sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1288 strcat (retbuf, buf);
1289 }
1290 more_info = 1; 1108 more_info = 1;
1291 break; 1109 break;
1292 1110
1293 case WEAPON: 1111 case WEAPON:
1294 /* Calculate it the same way fix_player does so the results 1112 /* Calculate it the same way fix_player does so the results
1295 * make sense. 1113 * make sense.
1296 */ 1114 */
1297 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1115 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1298 if (i < 0) 1116 if (i < 0)
1299 i = 0; 1117 i = 0;
1300 1118
1301 sprintf (buf, "(weapon speed %d)", i); 1119 buf.printf ("(weapon speed %d)", i);
1302 strcat (retbuf, buf);
1303 more_info = 1; 1120 more_info = 1;
1304 break; 1121 break;
1305
1306 } 1122 }
1123
1307 if (more_info) 1124 if (more_info)
1308 { 1125 {
1309 if (op->stats.food)
1310 {
1311 if (op->stats.food != 0)
1312 sprintf (buf, "(sustenance%+d)", op->stats.food); 1126 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1313 strcat (retbuf, buf);
1314 }
1315 if (op->stats.grace)
1316 {
1317 sprintf (buf, "(grace%+d)", op->stats.grace); 1127 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1318 strcat (retbuf, buf); 1128 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1319 }
1320 if (op->stats.sp)
1321 {
1322 sprintf (buf, "(magic%+d)", op->stats.sp);
1323 strcat (retbuf, buf);
1324 }
1325 if (op->stats.hp)
1326 {
1327 sprintf (buf, "(regeneration%+d)", op->stats.hp); 1129 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1328 strcat (retbuf, buf);
1329 }
1330 } 1130 }
1331 1131
1332 if (op->stats.luck) 1132 if (op->stats.luck)
1333 {
1334 sprintf (buf, "(luck%+d)", op->stats.luck); 1133 buf.printf ("(luck%+d)", op->stats.luck);
1335 strcat (retbuf, buf); 1134
1336 }
1337 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1135 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
1338 strcat (retbuf, "(lifesaving)"); 1136 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
1339 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
1340 strcat (retbuf, "(reflect spells)");
1341 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 1137 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1342 strcat (retbuf, "(reflect missiles)");
1343 if (QUERY_FLAG (op, FLAG_STEALTH)) 1138 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1344 strcat (retbuf, "(stealth)"); 1139
1345 if (op->slaying != NULL && op->type != FOOD) 1140 if (op->slaying && op->type != FOOD)
1346 {
1347 sprintf (buf, "(slay %s)", &op->slaying); 1141 buf.printf ("(slay %s)", &op->slaying);
1348 strcat (retbuf, buf); 1142
1349 } 1143 buf.add_abilities ("Attacks", op->attacktype);
1350 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1351 /* resistance on flesh is only visible for quetzals. If 1144 /* resistance on flesh is only visible for quetzals. If
1352 * non flesh, everyone can see its resistances 1145 * non flesh, everyone can see its resistances
1353 */ 1146 */
1354 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1147 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
1355 strcat (retbuf, describe_resistance (op, 0)); 1148 buf << describe_resistance (op, 0);
1356 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1357 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1358 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1359 }
1360 1149
1150 buf.add_paths ("Attuned", op->path_attuned);
1151 buf.add_paths ("Repelled", op->path_repelled);
1152 buf.add_paths ("Denied", op->path_denied);
1153 }
1154
1361 return retbuf; 1155 return buf;
1362} 1156}
1363 1157
1364std::string 1158std::string
1365object::describe_item (object *who) 1159object::describe_item (object *who)
1366{ 1160{
… …
1371 * increases/decreases any abilities, provides a resistance, 1165 * increases/decreases any abilities, provides a resistance,
1372 * has a generic magical bonus, or is an artifact. 1166 * has a generic magical bonus, or is an artifact.
1373 * This function is used by detect_magic to determine if an item 1167 * This function is used by detect_magic to determine if an item
1374 * should be marked as magical. 1168 * should be marked as magical.
1375 */ 1169 */
1376
1377int 1170int
1378is_magical (const object *op) 1171is_magical (const object *op)
1379{ 1172{
1380 int i; 1173 int i;
1381 1174

Diff Legend

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