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.34 by root, Mon May 14 21:32:26 2007 UTC vs.
Revision 1.44 by root, Sun Apr 13 21:22:47 2008 UTC

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

Diff Legend

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