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.10 by elmex, Wed Dec 20 10:31:00 2006 UTC vs.
Revision 1.25 by root, Sun Mar 18 03:05:39 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h> 26#include <funcpoint.h>
26#include <living.h> 27#include <living.h>
27#include <spells.h> 28#include <spells.h>
99 {POTION, "potion", "potions", SK_ALCHEMY, 0}, 100 {POTION, "potion", "potions", SK_ALCHEMY, 0},
100 {FOOD, "food", "food", SK_WOODSMAN, 0}, 101 {FOOD, "food", "food", SK_WOODSMAN, 0},
101 {POISON, "poison", "poisons", SK_ALCHEMY, 0}, 102 {POISON, "poison", "poisons", SK_ALCHEMY, 0},
102 {BOOK, "book", "books", SK_LITERACY, 0}, 103 {BOOK, "book", "books", SK_LITERACY, 0},
103 {CLOCK, "clock", "clocks", 0, 0}, 104 {CLOCK, "clock", "clocks", 0, 0},
104 {LIGHTNING, "lightning", "lightning", 0, 0},
105 {ARROW, "arrow", "arrows", SK_BOWYER, 0}, 105 {ARROW, "arrow", "arrows", SK_BOWYER, 0},
106 {BOW, "bow", "bows", SK_BOWYER, 0}, 106 {BOW, "bow", "bows", SK_BOWYER, 0},
107 {WEAPON, "weapon", "weapons", SK_SMITHERY, 0}, 107 {WEAPON, "weapon", "weapons", SK_SMITHERY, 0},
108 {ARMOUR, "armour", "armour", SK_SMITHERY, 0}, 108 {ARMOUR, "armour", "armour", SK_SMITHERY, 0},
109 {PEDESTAL, "pedestal", "pedestals", 0, 0}, 109 {PEDESTAL, "pedestal", "pedestals", 0, 0},
158 {FLOOR, "floor", "floors", 0, 0}, 158 {FLOOR, "floor", "floors", 0, 0},
159 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 159 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
160 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 160 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
161 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 161 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
162 {LIGHTER, "lighter", "lighters", 0, 0}, 162 {LIGHTER, "lighter", "lighters", 0, 0},
163 {TRAP_PART, "trap part", "trap parts", 0, 0}, 163 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
164 {WALL, "wall", "walls", 0, 0},
165 {LIGHT_SOURCE, "light source", "light sources", 0, 0},
166 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 164 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
167 {MONSTER, "monster", "monsters", 0, 0},
168 {SPAWN_GENERATOR, "monster generator", "monster generators", 0, 0},
169 {LAMP, "lamp", "lamps", 0, 0}, 165 {LAMP, "lamp", "lamps", 0, 0},
170 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 166 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
171 {TOOL, "tool", "tools", 0, 0},
172 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
173 {BUILDFAC, "building facility", "building facilities", 0, 0},
174 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 168 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
175 {SPINNER, "spinner", "spinners", 0, 0}, 169 {SPINNER, "spinner", "spinners", 0, 0},
176 {GATE, "gate", "gates", 0, 0}, 170 {GATE, "gate", "gates", 0, 0},
177 {BUTTON, "button", "buttons", 0, 0}, 171 {BUTTON, "button", "buttons", 0, 0},
178 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 172 {CF_HANDLE, "cf handle", "cf handles", 0, 0},
185 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0}, 179 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
186 {CONVERTER, "converter", "converters", 0, 0}, 180 {CONVERTER, "converter", "converters", 0, 0},
187 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0}, 181 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
188 {POISONING, "poisoning", "poisonings", 0, 0}, 182 {POISONING, "poisoning", "poisonings", 0, 0},
189 {SAVEBED, "savebed", "savebeds", 0, 0}, 183 {SAVEBED, "savebed", "savebeds", 0, 0},
190 {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
191 {FIREHOLES, "fireholes", "fireholes", 0, 0},
192 {WAND, "wand", "wands", SK_THAUMATURGY, 0}, 184 {WAND, "wand", "wands", SK_THAUMATURGY, 0},
193 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0}, 185 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
194 {DIRECTOR, "director", "directors", 0, 0}, 186 {DIRECTOR, "director", "directors", 0, 0},
195 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0}, 187 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
196 {FORCE, "force", "forces", 0, 0}, 188 {FORCE, "force", "forces", 0, 0},
395 * returns a static array of the description. This can return 387 * returns a static array of the description. This can return
396 * a big buffer. 388 * a big buffer.
397 * if newline is true, we don't put parens around the description 389 * if newline is true, we don't put parens around the description
398 * but do put a newline at the end. Useful when dumping to files 390 * but do put a newline at the end. Useful when dumping to files
399 */ 391 */
400char * 392const char *
401describe_resistance (const object *op, int newline) 393describe_resistance (const object *op, int newline)
402{ 394{
403 static char buf[VERY_BIG_BUF]; 395 static char buf[VERY_BIG_BUF];
404 char buf1[VERY_BIG_BUF]; 396 char buf1[VERY_BIG_BUF];
405 int tmpvar; 397 int tmpvar;
424/* 416/*
425 * query_weight(object) returns a character pointer to a static buffer 417 * query_weight(object) returns a character pointer to a static buffer
426 * containing the text-representation of the weight of the given object. 418 * containing the text-representation of the weight of the given object.
427 * The buffer will be overwritten by the next call to query_weight(). 419 * The buffer will be overwritten by the next call to query_weight().
428 */ 420 */
429 421const char *
430char *
431query_weight (const object *op) 422query_weight (const object *op)
432{ 423{
433 static char buf[10]; 424 static char buf[10];
434 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 425 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
435 426
436 if (op->weight < 0) 427 if (op->weight < 0)
437 return " "; 428 return " ";
429
438 if (i % 1000) 430 if (i % 1000)
439 sprintf (buf, "%6.1f", i / 1000.0); 431 sprintf (buf, "%6.1f", i / 1000.0);
440 else 432 else
441 sprintf (buf, "%4d ", i / 1000); 433 sprintf (buf, "%4d ", i / 1000);
434
442 return buf; 435 return buf;
443} 436}
444 437
445/* 438/*
446 * Returns the pointer to a static buffer containing 439 * Returns the pointer to a static buffer containing
447 * the number requested (of the form first, second, third...) 440 * the number requested (of the form first, second, third...)
448 */ 441 */
449 442const char *
450char *
451get_levelnumber (int i) 443get_levelnumber (int i)
452{ 444{
453 static char buf[MAX_BUF]; 445 static char buf[MAX_BUF];
454 446
455 if (i > 99) 447 if (i > 99)
456 { 448 {
457 sprintf (buf, "%d.", i); 449 sprintf (buf, "%d.", i);
458 return buf; 450 return buf;
459 } 451 }
452
460 if (i < 21) 453 if (i < 21)
461 return levelnumbers[i]; 454 return levelnumbers[i];
462 if (!(i % 10)) 455 if (!(i % 10))
463 return levelnumbers_10[i / 10]; 456 return levelnumbers_10[i / 10];
457
464 strcpy (buf, numbers_10[i / 10]); 458 strcpy (buf, numbers_10[i / 10]);
465 strcat (buf, levelnumbers[i % 10]); 459 strcat (buf, levelnumbers[i % 10]);
466 return buf; 460 return buf;
467} 461}
468
469 462
470/* 463/*
471 * get_number(integer) returns the text-representation of the given number 464 * get_number(integer) returns the text-representation of the given number
472 * in a static buffer. The buffer might be overwritten at the next 465 * in a static buffer. The buffer might be overwritten at the next
473 * call to get_number(). 466 * call to get_number().
474 * It is currently only used by the query_name() function. 467 * It is currently only used by the query_name() function.
475 */ 468 */
476 469const char *
477char *
478get_number (int i) 470get_number (int i)
479{ 471{
480 if (i <= 20) 472 if (i <= 20)
481 return numbers[i]; 473 return numbers[i];
482 else 474 else
499 */ 491 */
500 492
501/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 493/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
502 * from stats.sp - b.t. 494 * from stats.sp - b.t.
503 */ 495 */
504char * 496const char *
505ring_desc (const object *op) 497ring_desc (const object *op)
506{ 498{
507 static char buf[VERY_BIG_BUF]; 499 static char buf[VERY_BIG_BUF];
508 int attr, val, len; 500 int attr, val, len;
509 501
622 case AMULET: 614 case AMULET:
623 case RING: 615 case RING:
624 if (!op->title) 616 if (!op->title)
625 { 617 {
626 /* If ring has a title, full description isn't so useful */ 618 /* If ring has a title, full description isn't so useful */
627 char *s = ring_desc (op); 619 const char *s = ring_desc (op);
628 620
629 if (s[0]) 621 if (s[0])
630 { 622 {
631 safe_strcat (buf, " ", &len, HUGE_BUF); 623 safe_strcat (buf, " ", &len, HUGE_BUF);
632 safe_strcat (buf, s, &len, HUGE_BUF); 624 safe_strcat (buf, s, &len, HUGE_BUF);
652 * overwritten. This may be a bad thing (it may be easier to assume the value 644 * overwritten. This may be a bad thing (it may be easier to assume the value
653 * returned is good forever.) However, it makes printing statements that 645 * returned is good forever.) However, it makes printing statements that
654 * use several names much easier (don't need to store them to temp variables.) 646 * use several names much easier (don't need to store them to temp variables.)
655 * 647 *
656 */ 648 */
657char * 649const char *
658query_name (const object *op) 650query_name (const object *op)
659{ 651{
660 static char buf[5][HUGE_BUF]; 652 static char buf[5][HUGE_BUF]; // OMFG
661 static int use_buf = 0; 653 static int use_buf = 0;
662 int len = 0; 654 int len = 0;
663 655
664#ifdef NEW_MATERIAL_CODE 656#ifdef NEW_MATERIAL_CODE
665 materialtype_t *mt; 657 materialtype_t *mt;
692 if (QUERY_FLAG (op, FLAG_DAMNED)) 684 if (QUERY_FLAG (op, FLAG_DAMNED))
693 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
694 else if (QUERY_FLAG (op, FLAG_CURSED)) 686 else if (QUERY_FLAG (op, FLAG_CURSED))
695 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
696 } 688 }
689
697 /* Basically, if the object is known magical (detect magic spell on it), 690 /* Basically, if the object is known magical (detect magic spell on it),
698 * and it isn't identified, print out the fact that 691 * and it isn't identified, print out the fact that
699 * it is magical. Assume that the detect magical spell will only set 692 * it is magical. Assume that the detect magical spell will only set
700 * KNOWN_MAGICAL if the item actually is magical. 693 * KNOWN_MAGICAL if the item actually is magical.
701 * 694 *
717 710
718 if (QUERY_FLAG (op, FLAG_APPLIED)) 711 if (QUERY_FLAG (op, FLAG_APPLIED))
719 { 712 {
720 switch (op->type) 713 switch (op->type)
721 { 714 {
722 case BOW: 715 case BOW:
723 case WAND: 716 case WAND:
724 case ROD: 717 case ROD:
725 case HORN: 718 case HORN:
726 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 719 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
727 break; 720 break;
728 case WEAPON: 721 case WEAPON:
729 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 722 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);
730 break; 723 break;
731 case ARMOUR: 724 case ARMOUR:
732 case HELMET: 725 case HELMET:
733 case SHIELD: 726 case SHIELD:
734 case RING: 727 case RING:
735 case BOOTS: 728 case BOOTS:
736 case GLOVES: 729 case GLOVES:
737 case AMULET: 730 case AMULET:
738 case GIRDLE: 731 case GIRDLE:
739 case BRACERS: 732 case BRACERS:
740 case CLOAK: 733 case CLOAK:
741 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 734 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
742 break; 735 break;
743 case CONTAINER: 736 case CONTAINER:
744 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 737 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
745 break; 738 break;
746 case SKILL: 739 case SKILL:
747 default: 740 default:
748 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 741 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
749 } 742 }
750 } 743 }
744
751 if (QUERY_FLAG (op, FLAG_UNPAID)) 745 if (QUERY_FLAG (op, FLAG_UNPAID))
752 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 746 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
753 747
754 return buf[use_buf]; 748 return buf [use_buf];
755} 749}
756 750
757/* 751/*
758 * query_base_name(object) returns a character pointer pointing to a static 752 * query_base_name(object) returns a character pointer pointing to a static
759 * buffer which contains a verbose textual representation of the name 753 * buffer which contains a verbose textual representation of the name
793 } 787 }
794 else 788 else
795 { 789 {
796#endif 790#endif
797 if (!plural) 791 if (!plural)
798 strcpy (buf, op->name); 792 assign (buf, op->name);
799 else 793 else
800 strcpy (buf, op->name_pl); 794 assign (buf, op->name_pl);
795
801 len = strlen (buf); 796 len = strlen (buf);
802#ifdef NEW_MATERIAL_CODE 797#ifdef NEW_MATERIAL_CODE
803 } 798 }
804#endif 799#endif
805 800
809 safe_strcat (buf, op->title, &len, MAX_BUF); 804 safe_strcat (buf, op->title, &len, MAX_BUF);
810 } 805 }
811 806
812 switch (op->type) 807 switch (op->type)
813 { 808 {
814 case SPELLBOOK: 809 case SPELLBOOK:
815 case SCROLL: 810 case SCROLL:
816 case WAND: 811 case WAND:
817 case ROD: 812 case ROD:
818 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 813 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
819 { 814 {
820 if (!op->title) 815 if (!op->title)
821 { 816 {
822 safe_strcat (buf, " of ", &len, MAX_BUF); 817 safe_strcat (buf, " of ", &len, MAX_BUF);
823 if (op->inv) 818 if (op->inv)
824 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 819 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
825 else 820 else
826 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
827 } 822 }
828 if (op->type != SPELLBOOK) 823 if (op->type != SPELLBOOK)
829 { 824 {
830 sprintf (buf2, " (lvl %d)", op->level); 825 sprintf (buf2, " (lvl %d)", op->level);
831 safe_strcat (buf, buf2, &len, MAX_BUF); 826 safe_strcat (buf, buf2, &len, MAX_BUF);
832 } 827 }
833 } 828 }
834 break; 829 break;
835 830
836 831
837 case SKILL: 832 case SKILL:
838 case AMULET: 833 case AMULET:
839 case RING: 834 case RING:
840 if (!op->title) 835 if (!op->title)
841 { 836 {
842 /* If ring has a title, full description isn't so useful */ 837 /* If ring has a title, full description isn't so useful */
843 char *s = ring_desc (op); 838 const char *s = ring_desc (op);
844 839
845 if (s[0]) 840 if (s[0])
846 { 841 {
847 safe_strcat (buf, " ", &len, MAX_BUF); 842 safe_strcat (buf, " ", &len, MAX_BUF);
848 safe_strcat (buf, s, &len, MAX_BUF); 843 safe_strcat (buf, s, &len, MAX_BUF);
849 } 844 }
850 } 845 }
851 break; 846 break;
852 default: 847 default:
853 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 848 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
854 { 849 {
855 sprintf (buf + strlen (buf), " %+d", op->magic); 850 sprintf (buf + strlen (buf), " %+d", op->magic);
856 } 851 }
857 } 852 }
853
858 return buf; 854 return buf;
859} 855}
860 856
861/* Break this off from describe_item - that function was way 857/* Break this off from describe_item - that function was way
862 * too long, making it difficult to read. This function deals 858 * too long, making it difficult to read. This function deals
863 * with describing the monsters & players abilities. It should only 859 * with describing the monsters & players abilities. It should only
864 * be called with monster & player objects. Returns a description 860 * be called with monster & player objects. Returns a description
865 * in a static buffer. 861 * in a static buffer.
866 */ 862 */
867
868static char * 863static char *
869describe_monster (const object *op) 864describe_monster (const object *op)
870{ 865{
871 char buf[MAX_BUF]; 866 char buf[MAX_BUF];
872 static char retbuf[VERY_BIG_BUF]; 867 static char retbuf[VERY_BIG_BUF];
876 871
877 /* Note that the resolution this provides for players really isn't 872 /* Note that the resolution this provides for players really isn't
878 * very good. Any player with a speed greater than .67 will 873 * very good. Any player with a speed greater than .67 will
879 * fall into the 'lightning fast movement' category. 874 * fall into the 'lightning fast movement' category.
880 */ 875 */
881 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 876 if (op->has_active_speed ())
882 { 877 {
883 switch ((int) ((FABS (op->speed)) * 15)) 878 switch ((int) ((FABS (op->speed)) * 15))
884 { 879 {
885 case 0: 880 case 0:
886 strcat (retbuf, "(very slow movement)"); 881 strcat (retbuf, "(very slow movement)");
942 { 937 {
943 treasure *t; 938 treasure *t;
944 int first = 1; 939 int first = 1;
945 940
946 for (t = op->randomitems->items; t != NULL; t = t->next) 941 for (t = op->randomitems->items; t != NULL; t = t->next)
947 if (t->item && (t->item->clone.type == SPELL)) 942 if (t->item && t->item->clone.type == SPELL)
948 { 943 {
949 if (first) 944 if (first)
950 { 945 {
951 first = 0; 946 first = 0;
952 strcat (retbuf, "(Spell abilities:)"); 947 strcat (retbuf, "(Spell abilities:)");
998 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 993 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
999 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 994 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
1000 break; 995 break;
1001 996
1002 if (tmp && tmp->attacktype != 0) 997 if (tmp && tmp->attacktype != 0)
1003 {
1004 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 998 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
1005 }
1006 else 999 else
1007 {
1008 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1000 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1009 }
1010 } 1001 }
1011 else 1002 else
1012 {
1013 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1003 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1014 } 1004
1015 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1005 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1016 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1006 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1017 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1007 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1008
1018 for (i = 0; i < NROFATTACKS; i++) 1009 for (i = 0; i < NROFATTACKS; i++)
1019 {
1020 if (op->resist[i]) 1010 if (op->resist[i])
1021 { 1011 {
1022 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 1012 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1023 strcat (retbuf, buf); 1013 strcat (retbuf, buf);
1024 } 1014 }
1025 } 1015
1026 return retbuf; 1016 return retbuf;
1027} 1017}
1028 1018
1029 1019
1030/* 1020/*
1051 * 1041 *
1052 * Add 'owner' who is the person examining this object. 1042 * Add 'owner' who is the person examining this object.
1053 * owner can be null if no one is being associated with this 1043 * owner can be null if no one is being associated with this
1054 * item (eg, debug dump or the like) 1044 * item (eg, debug dump or the like)
1055 */ 1045 */
1056 1046const char *
1057char *
1058describe_item (const object *op, object *owner) 1047describe_item (const object *op, object *owner)
1059{ 1048{
1060 char buf[MAX_BUF]; 1049 char buf[MAX_BUF];
1061 static char retbuf[VERY_BIG_BUF]; 1050 static char retbuf[VERY_BIG_BUF];
1062 int identified, i; 1051 int identified, i;
1532 } 1521 }
1533 } 1522 }
1534 1523
1535 /* If the object is on a map, make sure we update its face */ 1524 /* If the object is on a map, make sure we update its face */
1536 if (op->map) 1525 if (op->map)
1537 update_object (op, UP_OBJ_FACE); 1526 update_object (op, UP_OBJ_CHANGE);
1538 else 1527 else
1539 { 1528 {
1540 pl = op->in_player (); 1529 pl = op->in_player ();
1541 if (pl) 1530 if (pl)
1542 /* A lot of the values can change from an update - might as well send 1531 /* A lot of the values can change from an update - might as well send

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines