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

Diff Legend

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