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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines