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.11 by elmex, Wed Dec 20 11:20:50 2006 UTC vs.
Revision 1.26 by root, Mon Apr 23 18:09:57 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>
157 {FLOOR, "floor", "floors", 0, 0}, 158 {FLOOR, "floor", "floors", 0, 0},
158 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 159 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
159 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 160 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
160 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 161 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
161 {LIGHTER, "lighter", "lighters", 0, 0}, 162 {LIGHTER, "lighter", "lighters", 0, 0},
162 {TRAP_PART, "trap part", "trap parts", 0, 0}, 163 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
163 {WALL, "wall", "walls", 0, 0},
164 {LIGHT_SOURCE, "light source", "light sources", 0, 0},
165 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 164 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
166 {MONSTER, "monster", "monsters", 0, 0},
167 {SPAWN_GENERATOR, "monster generator", "monster generators", 0, 0},
168 {LAMP, "lamp", "lamps", 0, 0}, 165 {LAMP, "lamp", "lamps", 0, 0},
169 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 166 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
170 {TOOL, "tool", "tools", 0, 0},
171 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
172 {BUILDFAC, "building facility", "building facilities", 0, 0},
173 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 168 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
174 {SPINNER, "spinner", "spinners", 0, 0}, 169 {SPINNER, "spinner", "spinners", 0, 0},
175 {GATE, "gate", "gates", 0, 0}, 170 {GATE, "gate", "gates", 0, 0},
176 {BUTTON, "button", "buttons", 0, 0}, 171 {BUTTON, "button", "buttons", 0, 0},
177 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 172 {CF_HANDLE, "cf handle", "cf handles", 0, 0},
184 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0}, 179 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
185 {CONVERTER, "converter", "converters", 0, 0}, 180 {CONVERTER, "converter", "converters", 0, 0},
186 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0}, 181 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
187 {POISONING, "poisoning", "poisonings", 0, 0}, 182 {POISONING, "poisoning", "poisonings", 0, 0},
188 {SAVEBED, "savebed", "savebeds", 0, 0}, 183 {SAVEBED, "savebed", "savebeds", 0, 0},
189 {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
190 {FIREHOLES, "fireholes", "fireholes", 0, 0},
191 {WAND, "wand", "wands", SK_THAUMATURGY, 0}, 184 {WAND, "wand", "wands", SK_THAUMATURGY, 0},
192 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0}, 185 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
193 {DIRECTOR, "director", "directors", 0, 0}, 186 {DIRECTOR, "director", "directors", 0, 0},
194 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0}, 187 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
195 {FORCE, "force", "forces", 0, 0}, 188 {FORCE, "force", "forces", 0, 0},
394 * returns a static array of the description. This can return 387 * returns a static array of the description. This can return
395 * a big buffer. 388 * a big buffer.
396 * 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
397 * 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
398 */ 391 */
399char * 392const char *
400describe_resistance (const object *op, int newline) 393describe_resistance (const object *op, int newline)
401{ 394{
402 static char buf[VERY_BIG_BUF]; 395 static char buf[VERY_BIG_BUF];
403 char buf1[VERY_BIG_BUF]; 396 char buf1[VERY_BIG_BUF];
404 int tmpvar; 397 int tmpvar;
423/* 416/*
424 * query_weight(object) returns a character pointer to a static buffer 417 * query_weight(object) returns a character pointer to a static buffer
425 * containing the text-representation of the weight of the given object. 418 * containing the text-representation of the weight of the given object.
426 * 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().
427 */ 420 */
428 421const char *
429char *
430query_weight (const object *op) 422query_weight (const object *op)
431{ 423{
432 static char buf[10]; 424 static char buf[10];
433 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 425 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
434 426
435 if (op->weight < 0) 427 if (op->weight < 0)
436 return " "; 428 return " ";
429
437 if (i % 1000) 430 if (i % 1000)
438 sprintf (buf, "%6.1f", i / 1000.0); 431 sprintf (buf, "%6.1f", i / 1000.0);
439 else 432 else
440 sprintf (buf, "%4d ", i / 1000); 433 sprintf (buf, "%4d ", i / 1000);
434
441 return buf; 435 return buf;
442} 436}
443 437
444/* 438/*
445 * Returns the pointer to a static buffer containing 439 * Returns the pointer to a static buffer containing
446 * the number requested (of the form first, second, third...) 440 * the number requested (of the form first, second, third...)
447 */ 441 */
448 442const char *
449char *
450get_levelnumber (int i) 443get_levelnumber (int i)
451{ 444{
452 static char buf[MAX_BUF]; 445 static char buf[MAX_BUF];
453 446
454 if (i > 99) 447 if (i > 99)
455 { 448 {
456 sprintf (buf, "%d.", i); 449 sprintf (buf, "%d.", i);
457 return buf; 450 return buf;
458 } 451 }
452
459 if (i < 21) 453 if (i < 21)
460 return levelnumbers[i]; 454 return levelnumbers[i];
461 if (!(i % 10)) 455 if (!(i % 10))
462 return levelnumbers_10[i / 10]; 456 return levelnumbers_10[i / 10];
457
463 strcpy (buf, numbers_10[i / 10]); 458 strcpy (buf, numbers_10[i / 10]);
464 strcat (buf, levelnumbers[i % 10]); 459 strcat (buf, levelnumbers[i % 10]);
465 return buf; 460 return buf;
466} 461}
467
468 462
469/* 463/*
470 * get_number(integer) returns the text-representation of the given number 464 * get_number(integer) returns the text-representation of the given number
471 * 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
472 * call to get_number(). 466 * call to get_number().
473 * It is currently only used by the query_name() function. 467 * It is currently only used by the query_name() function.
474 */ 468 */
475 469const char *
476char *
477get_number (int i) 470get_number (int i)
478{ 471{
479 if (i <= 20) 472 if (i <= 20)
480 return numbers[i]; 473 return numbers[i];
481 else 474 else
498 */ 491 */
499 492
500/* 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
501 * from stats.sp - b.t. 494 * from stats.sp - b.t.
502 */ 495 */
503char * 496const char *
504ring_desc (const object *op) 497ring_desc (const object *op)
505{ 498{
506 static char buf[VERY_BIG_BUF]; 499 static char buf[VERY_BIG_BUF];
507 int attr, val, len; 500 int attr, val, len;
508 501
621 case AMULET: 614 case AMULET:
622 case RING: 615 case RING:
623 if (!op->title) 616 if (!op->title)
624 { 617 {
625 /* If ring has a title, full description isn't so useful */ 618 /* If ring has a title, full description isn't so useful */
626 char *s = ring_desc (op); 619 const char *s = ring_desc (op);
627 620
628 if (s[0]) 621 if (s[0])
629 { 622 {
630 safe_strcat (buf, " ", &len, HUGE_BUF); 623 safe_strcat (buf, " ", &len, HUGE_BUF);
631 safe_strcat (buf, s, &len, HUGE_BUF); 624 safe_strcat (buf, s, &len, HUGE_BUF);
651 * 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
652 * returned is good forever.) However, it makes printing statements that 645 * returned is good forever.) However, it makes printing statements that
653 * 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.)
654 * 647 *
655 */ 648 */
656char * 649const char *
657query_name (const object *op) 650query_name (const object *op)
658{ 651{
659 static char buf[5][HUGE_BUF]; 652 static char buf[5][HUGE_BUF]; // OMFG
660 static int use_buf = 0; 653 static int use_buf = 0;
661 int len = 0; 654 int len = 0;
662 655
663#ifdef NEW_MATERIAL_CODE 656#ifdef NEW_MATERIAL_CODE
664 materialtype_t *mt; 657 materialtype_t *mt;
691 if (QUERY_FLAG (op, FLAG_DAMNED)) 684 if (QUERY_FLAG (op, FLAG_DAMNED))
692 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
693 else if (QUERY_FLAG (op, FLAG_CURSED)) 686 else if (QUERY_FLAG (op, FLAG_CURSED))
694 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
695 } 688 }
689
696 /* 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),
697 * and it isn't identified, print out the fact that 691 * and it isn't identified, print out the fact that
698 * 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
699 * KNOWN_MAGICAL if the item actually is magical. 693 * KNOWN_MAGICAL if the item actually is magical.
700 * 694 *
716 710
717 if (QUERY_FLAG (op, FLAG_APPLIED)) 711 if (QUERY_FLAG (op, FLAG_APPLIED))
718 { 712 {
719 switch (op->type) 713 switch (op->type)
720 { 714 {
721 case BOW: 715 case BOW:
722 case WAND: 716 case WAND:
723 case ROD: 717 case ROD:
724 case HORN: 718 case HORN:
725 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 719 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
726 break; 720 break;
727 case WEAPON: 721 case WEAPON:
728 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 722 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);
729 break; 723 break;
730 case ARMOUR: 724 case ARMOUR:
731 case HELMET: 725 case HELMET:
732 case SHIELD: 726 case SHIELD:
733 case RING: 727 case RING:
734 case BOOTS: 728 case BOOTS:
735 case GLOVES: 729 case GLOVES:
736 case AMULET: 730 case AMULET:
737 case GIRDLE: 731 case GIRDLE:
738 case BRACERS: 732 case BRACERS:
739 case CLOAK: 733 case CLOAK:
740 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 734 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
741 break; 735 break;
742 case CONTAINER: 736 case CONTAINER:
743 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 737 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
744 break; 738 break;
745 case SKILL: 739 case SKILL:
746 default: 740 default:
747 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 741 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
748 } 742 }
749 } 743 }
744
750 if (QUERY_FLAG (op, FLAG_UNPAID)) 745 if (QUERY_FLAG (op, FLAG_UNPAID))
751 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 746 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
752 747
753 return buf[use_buf]; 748 return buf [use_buf];
754} 749}
755 750
756/* 751/*
757 * 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
758 * buffer which contains a verbose textual representation of the name 753 * buffer which contains a verbose textual representation of the name
792 } 787 }
793 else 788 else
794 { 789 {
795#endif 790#endif
796 if (!plural) 791 if (!plural)
797 strcpy (buf, op->name); 792 assign (buf, op->name);
798 else 793 else
799 strcpy (buf, op->name_pl); 794 assign (buf, op->name_pl);
795
800 len = strlen (buf); 796 len = strlen (buf);
801#ifdef NEW_MATERIAL_CODE 797#ifdef NEW_MATERIAL_CODE
802 } 798 }
803#endif 799#endif
804 800
808 safe_strcat (buf, op->title, &len, MAX_BUF); 804 safe_strcat (buf, op->title, &len, MAX_BUF);
809 } 805 }
810 806
811 switch (op->type) 807 switch (op->type)
812 { 808 {
813 case SPELLBOOK: 809 case SPELLBOOK:
814 case SCROLL: 810 case SCROLL:
815 case WAND: 811 case WAND:
816 case ROD: 812 case ROD:
817 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))
818 { 814 {
819 if (!op->title) 815 if (!op->title)
820 { 816 {
821 safe_strcat (buf, " of ", &len, MAX_BUF); 817 safe_strcat (buf, " of ", &len, MAX_BUF);
822 if (op->inv) 818 if (op->inv)
823 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 819 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
824 else 820 else
825 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
826 } 822 }
827 if (op->type != SPELLBOOK) 823 if (op->type != SPELLBOOK)
828 { 824 {
829 sprintf (buf2, " (lvl %d)", op->level); 825 sprintf (buf2, " (lvl %d)", op->level);
830 safe_strcat (buf, buf2, &len, MAX_BUF); 826 safe_strcat (buf, buf2, &len, MAX_BUF);
831 } 827 }
832 } 828 }
833 break; 829 break;
834 830
835 831
836 case SKILL: 832 case SKILL:
837 case AMULET: 833 case AMULET:
838 case RING: 834 case RING:
839 if (!op->title) 835 if (!op->title)
840 { 836 {
841 /* If ring has a title, full description isn't so useful */ 837 /* If ring has a title, full description isn't so useful */
842 char *s = ring_desc (op); 838 const char *s = ring_desc (op);
843 839
844 if (s[0]) 840 if (s[0])
845 { 841 {
846 safe_strcat (buf, " ", &len, MAX_BUF); 842 safe_strcat (buf, " ", &len, MAX_BUF);
847 safe_strcat (buf, s, &len, MAX_BUF); 843 safe_strcat (buf, s, &len, MAX_BUF);
848 } 844 }
849 } 845 }
850 break; 846 break;
851 default: 847 default:
852 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)))
853 { 849 {
854 sprintf (buf + strlen (buf), " %+d", op->magic); 850 sprintf (buf + strlen (buf), " %+d", op->magic);
855 } 851 }
856 } 852 }
853
857 return buf; 854 return buf;
858} 855}
859 856
860/* Break this off from describe_item - that function was way 857/* Break this off from describe_item - that function was way
861 * too long, making it difficult to read. This function deals 858 * too long, making it difficult to read. This function deals
862 * with describing the monsters & players abilities. It should only 859 * with describing the monsters & players abilities. It should only
863 * be called with monster & player objects. Returns a description 860 * be called with monster & player objects. Returns a description
864 * in a static buffer. 861 * in a static buffer.
865 */ 862 */
866
867static char * 863static char *
868describe_monster (const object *op) 864describe_monster (const object *op)
869{ 865{
870 char buf[MAX_BUF]; 866 char buf[MAX_BUF];
871 static char retbuf[VERY_BIG_BUF]; 867 static char retbuf[VERY_BIG_BUF];
875 871
876 /* Note that the resolution this provides for players really isn't 872 /* Note that the resolution this provides for players really isn't
877 * very good. Any player with a speed greater than .67 will 873 * very good. Any player with a speed greater than .67 will
878 * fall into the 'lightning fast movement' category. 874 * fall into the 'lightning fast movement' category.
879 */ 875 */
880 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 876 if (op->has_active_speed ())
881 { 877 {
882 switch ((int) ((FABS (op->speed)) * 15)) 878 switch ((int) ((FABS (op->speed)) * 15))
883 { 879 {
884 case 0: 880 case 0:
885 strcat (retbuf, "(very slow movement)"); 881 strcat (retbuf, "(very slow movement)");
941 { 937 {
942 treasure *t; 938 treasure *t;
943 int first = 1; 939 int first = 1;
944 940
945 for (t = op->randomitems->items; t != NULL; t = t->next) 941 for (t = op->randomitems->items; t != NULL; t = t->next)
946 if (t->item && (t->item->clone.type == SPELL)) 942 if (t->item && t->item->clone.type == SPELL)
947 { 943 {
948 if (first) 944 if (first)
949 { 945 {
950 first = 0; 946 first = 0;
951 strcat (retbuf, "(Spell abilities:)"); 947 strcat (retbuf, "(Spell abilities:)");
997 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 993 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
998 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 994 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
999 break; 995 break;
1000 996
1001 if (tmp && tmp->attacktype != 0) 997 if (tmp && tmp->attacktype != 0)
1002 {
1003 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 998 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
1004 }
1005 else 999 else
1006 {
1007 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1000 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1008 }
1009 } 1001 }
1010 else 1002 else
1011 {
1012 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1003 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1013 } 1004
1014 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1005 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1015 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1006 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1016 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1007 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1008
1017 for (i = 0; i < NROFATTACKS; i++) 1009 for (i = 0; i < NROFATTACKS; i++)
1018 {
1019 if (op->resist[i]) 1010 if (op->resist[i])
1020 { 1011 {
1021 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 1012 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1022 strcat (retbuf, buf); 1013 strcat (retbuf, buf);
1023 } 1014 }
1024 } 1015
1025 return retbuf; 1016 return retbuf;
1026} 1017}
1027 1018
1028 1019
1029/* 1020/*
1050 * 1041 *
1051 * Add 'owner' who is the person examining this object. 1042 * Add 'owner' who is the person examining this object.
1052 * 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
1053 * item (eg, debug dump or the like) 1044 * item (eg, debug dump or the like)
1054 */ 1045 */
1055 1046const char *
1056char *
1057describe_item (const object *op, object *owner) 1047describe_item (const object *op, object *owner)
1058{ 1048{
1059 char buf[MAX_BUF]; 1049 char buf[MAX_BUF];
1060 static char retbuf[VERY_BIG_BUF]; 1050 static char retbuf[VERY_BIG_BUF];
1061 int identified, i; 1051 int identified, i;
1371 } 1361 }
1372 1362
1373 return retbuf; 1363 return retbuf;
1374} 1364}
1375 1365
1366std::string
1367object::describe_item (object *who)
1368{
1369 return std::string (::describe_item (this, who));
1370}
1371
1376/* Return true if the item is magical. A magical item is one that 1372/* Return true if the item is magical. A magical item is one that
1377 * increases/decreases any abilities, provides a resistance, 1373 * increases/decreases any abilities, provides a resistance,
1378 * has a generic magical bonus, or is an artifact. 1374 * has a generic magical bonus, or is an artifact.
1379 * This function is used by detect_magic to determine if an item 1375 * This function is used by detect_magic to determine if an item
1380 * should be marked as magical. 1376 * should be marked as magical.
1531 } 1527 }
1532 } 1528 }
1533 1529
1534 /* If the object is on a map, make sure we update its face */ 1530 /* If the object is on a map, make sure we update its face */
1535 if (op->map) 1531 if (op->map)
1536 update_object (op, UP_OBJ_FACE); 1532 update_object (op, UP_OBJ_CHANGE);
1537 else 1533 else
1538 { 1534 {
1539 pl = op->in_player (); 1535 pl = op->in_player ();
1540 if (pl) 1536 if (pl)
1541 /* A lot of the values can change from an update - might as well send 1537 /* A lot of the values can change from an update - might as well send

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines