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.14 by elmex, Wed Dec 20 14:11:42 2006 UTC vs.
Revision 1.28 by root, Wed May 2 05:59:06 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
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>
161 {LIGHTER, "lighter", "lighters", 0, 0}, 162 {LIGHTER, "lighter", "lighters", 0, 0},
162 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 163 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
163 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 164 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
164 {LAMP, "lamp", "lamps", 0, 0}, 165 {LAMP, "lamp", "lamps", 0, 0},
165 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 166 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
166 {TOOL, "tool", "tools", 0, 0},
167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
168 {BUILDFAC, "building facility", "building facilities", 0, 0},
169 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 168 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
170 {SPINNER, "spinner", "spinners", 0, 0}, 169 {SPINNER, "spinner", "spinners", 0, 0},
171 {GATE, "gate", "gates", 0, 0}, 170 {GATE, "gate", "gates", 0, 0},
172 {BUTTON, "button", "buttons", 0, 0}, 171 {BUTTON, "button", "buttons", 0, 0},
173 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 172 {CF_HANDLE, "cf handle", "cf handles", 0, 0},
251}; 250};
252 251
253int 252int
254get_power_from_ench (int ench) 253get_power_from_ench (int ench)
255{ 254{
256 if (ench < 0) 255 if (ench < 0) ench = 0;
257 ench = 0; 256 if (ench > 20) ench = 20;
258 if (ench > 20) 257
259 ench = 20;
260 return enc_to_item_power[ench]; 258 return enc_to_item_power[ench];
261} 259}
262 260
263/* This takes an object 'op' and figures out what its item_power 261/* This takes an object 'op' and figures out what its item_power
264 * rating should be. This should only really be used by the treasure 262 * rating should be. This should only really be used by the treasure
343 enc += 1; 341 enc += 1;
344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 342 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
345 enc += 1; 343 enc += 1;
346 344
347 return get_power_from_ench (enc); 345 return get_power_from_ench (enc);
348
349} 346}
350 347
351/* returns the typedata that has a number equal to itemtype, if there 348/* returns the typedata that has a number equal to itemtype, if there
352 * isn't one, returns NULL */ 349 * isn't one, returns NULL */
353
354const typedata * 350const typedata *
355get_typedata (int itemtype) 351get_typedata (int itemtype)
356{ 352{
357 int i; 353 int i;
358 354
363} 359}
364 360
365/* returns the typedata that has a name equal to itemtype, if there 361/* returns the typedata that has a name equal to itemtype, if there
366 * isn't one, return the plural name that matches, if there still isn't 362 * isn't one, return the plural name that matches, if there still isn't
367 * one return NULL */ 363 * one return NULL */
368
369const typedata * 364const typedata *
370get_typedata_by_name (const char *name) 365get_typedata_by_name (const char *name)
371{ 366{
372 int i; 367 int i;
373 368
388 * returns a static array of the description. This can return 383 * returns a static array of the description. This can return
389 * a big buffer. 384 * a big buffer.
390 * if newline is true, we don't put parens around the description 385 * if newline is true, we don't put parens around the description
391 * but do put a newline at the end. Useful when dumping to files 386 * but do put a newline at the end. Useful when dumping to files
392 */ 387 */
393char * 388const char *
394describe_resistance (const object *op, int newline) 389describe_resistance (const object *op, int newline)
395{ 390{
396 static char buf[VERY_BIG_BUF]; 391 static char buf[VERY_BIG_BUF];
397 char buf1[VERY_BIG_BUF]; 392 char buf1[VERY_BIG_BUF];
398 int tmpvar; 393 int tmpvar;
417/* 412/*
418 * query_weight(object) returns a character pointer to a static buffer 413 * query_weight(object) returns a character pointer to a static buffer
419 * containing the text-representation of the weight of the given object. 414 * containing the text-representation of the weight of the given object.
420 * The buffer will be overwritten by the next call to query_weight(). 415 * The buffer will be overwritten by the next call to query_weight().
421 */ 416 */
422 417const char *
423char *
424query_weight (const object *op) 418query_weight (const object *op)
425{ 419{
426 static char buf[10]; 420 static char buf[10];
427 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 421 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
428 422
429 if (op->weight < 0) 423 if (op->weight < 0)
430 return " "; 424 return " ";
425
431 if (i % 1000) 426 if (i % 1000)
432 sprintf (buf, "%6.1f", i / 1000.0); 427 sprintf (buf, "%6.1f", i / 1000.0);
433 else 428 else
434 sprintf (buf, "%4d ", i / 1000); 429 sprintf (buf, "%4d ", i / 1000);
430
435 return buf; 431 return buf;
436} 432}
437 433
438/* 434/*
439 * Returns the pointer to a static buffer containing 435 * Returns the pointer to a static buffer containing
440 * the number requested (of the form first, second, third...) 436 * the number requested (of the form first, second, third...)
441 */ 437 */
442 438const char *
443char *
444get_levelnumber (int i) 439get_levelnumber (int i)
445{ 440{
446 static char buf[MAX_BUF]; 441 static char buf[MAX_BUF];
447 442
448 if (i > 99) 443 if (i > 99)
449 { 444 {
450 sprintf (buf, "%d.", i); 445 sprintf (buf, "%d.", i);
451 return buf; 446 return buf;
452 } 447 }
448
453 if (i < 21) 449 if (i < 21)
454 return levelnumbers[i]; 450 return levelnumbers[i];
455 if (!(i % 10)) 451 if (!(i % 10))
456 return levelnumbers_10[i / 10]; 452 return levelnumbers_10[i / 10];
453
457 strcpy (buf, numbers_10[i / 10]); 454 strcpy (buf, numbers_10[i / 10]);
458 strcat (buf, levelnumbers[i % 10]); 455 strcat (buf, levelnumbers[i % 10]);
459 return buf; 456 return buf;
460} 457}
461
462 458
463/* 459/*
464 * get_number(integer) returns the text-representation of the given number 460 * get_number(integer) returns the text-representation of the given number
465 * in a static buffer. The buffer might be overwritten at the next 461 * in a static buffer. The buffer might be overwritten at the next
466 * call to get_number(). 462 * call to get_number().
467 * It is currently only used by the query_name() function. 463 * It is currently only used by the query_name() function.
468 */ 464 */
469 465const char *
470char *
471get_number (int i) 466get_number (int i)
472{ 467{
473 if (i <= 20) 468 if (i <= 20)
474 return numbers[i]; 469 return numbers[i];
475 else 470 else
492 */ 487 */
493 488
494/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 489/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
495 * from stats.sp - b.t. 490 * from stats.sp - b.t.
496 */ 491 */
497char * 492const char *
498ring_desc (const object *op) 493ring_desc (const object *op)
499{ 494{
500 static char buf[VERY_BIG_BUF]; 495 static char buf[VERY_BIG_BUF];
501 int attr, val, len; 496 int attr, val, len;
502 497
510 if ((val = get_attr_value (&(op->stats), attr)) != 0) 505 if ((val = get_attr_value (&(op->stats), attr)) != 0)
511 { 506 {
512 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 507 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
513 } 508 }
514 } 509 }
510
515 if (op->stats.exp) 511 if (op->stats.exp)
516 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 512 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
517 if (op->stats.wc) 513 if (op->stats.wc)
518 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 514 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
519 if (op->stats.dam) 515 if (op->stats.dam)
541 strcat (buf, "(reflect spells)"); 537 strcat (buf, "(reflect spells)");
542 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 538 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
543 strcat (buf, "(reflect missiles)"); 539 strcat (buf, "(reflect missiles)");
544 if (QUERY_FLAG (op, FLAG_STEALTH)) 540 if (QUERY_FLAG (op, FLAG_STEALTH))
545 strcat (buf, "(stealth)"); 541 strcat (buf, "(stealth)");
542
546 /* Shorten some of the names, so they appear better in the windows */ 543 /* Shorten some of the names, so they appear better in the windows */
547 len = strlen (buf); 544 len = strlen (buf);
548 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 545 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
549 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 546 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
550 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF); 547 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
615 case AMULET: 612 case AMULET:
616 case RING: 613 case RING:
617 if (!op->title) 614 if (!op->title)
618 { 615 {
619 /* If ring has a title, full description isn't so useful */ 616 /* If ring has a title, full description isn't so useful */
620 char *s = ring_desc (op); 617 const char *s = ring_desc (op);
621 618
622 if (s[0]) 619 if (s[0])
623 { 620 {
624 safe_strcat (buf, " ", &len, HUGE_BUF); 621 safe_strcat (buf, " ", &len, HUGE_BUF);
625 safe_strcat (buf, s, &len, HUGE_BUF); 622 safe_strcat (buf, s, &len, HUGE_BUF);
645 * overwritten. This may be a bad thing (it may be easier to assume the value 642 * overwritten. This may be a bad thing (it may be easier to assume the value
646 * returned is good forever.) However, it makes printing statements that 643 * returned is good forever.) However, it makes printing statements that
647 * use several names much easier (don't need to store them to temp variables.) 644 * use several names much easier (don't need to store them to temp variables.)
648 * 645 *
649 */ 646 */
650char * 647const char *
651query_name (const object *op) 648query_name (const object *op)
652{ 649{
653 static char buf[5][HUGE_BUF]; 650 static char buf[5][HUGE_BUF]; // OMFG
654 static int use_buf = 0; 651 static int use_buf = 0;
655 int len = 0; 652 int len = 0;
656 653
657#ifdef NEW_MATERIAL_CODE 654#ifdef NEW_MATERIAL_CODE
658 materialtype_t *mt; 655 materialtype_t *mt;
685 if (QUERY_FLAG (op, FLAG_DAMNED)) 682 if (QUERY_FLAG (op, FLAG_DAMNED))
686 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 683 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
687 else if (QUERY_FLAG (op, FLAG_CURSED)) 684 else if (QUERY_FLAG (op, FLAG_CURSED))
688 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 685 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
689 } 686 }
687
690 /* Basically, if the object is known magical (detect magic spell on it), 688 /* Basically, if the object is known magical (detect magic spell on it),
691 * and it isn't identified, print out the fact that 689 * and it isn't identified, print out the fact that
692 * it is magical. Assume that the detect magical spell will only set 690 * it is magical. Assume that the detect magical spell will only set
693 * KNOWN_MAGICAL if the item actually is magical. 691 * KNOWN_MAGICAL if the item actually is magical.
694 * 692 *
710 708
711 if (QUERY_FLAG (op, FLAG_APPLIED)) 709 if (QUERY_FLAG (op, FLAG_APPLIED))
712 { 710 {
713 switch (op->type) 711 switch (op->type)
714 { 712 {
715 case BOW: 713 case BOW:
716 case WAND: 714 case WAND:
717 case ROD: 715 case ROD:
718 case HORN: 716 case HORN:
719 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 717 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
720 break; 718 break;
721 case WEAPON: 719 case WEAPON:
722 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 720 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
723 break; 721 break;
724 case ARMOUR: 722 case ARMOUR:
725 case HELMET: 723 case HELMET:
726 case SHIELD: 724 case SHIELD:
727 case RING: 725 case RING:
728 case BOOTS: 726 case BOOTS:
729 case GLOVES: 727 case GLOVES:
730 case AMULET: 728 case AMULET:
731 case GIRDLE: 729 case GIRDLE:
732 case BRACERS: 730 case BRACERS:
733 case CLOAK: 731 case CLOAK:
734 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 732 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
735 break; 733 break;
736 case CONTAINER: 734 case CONTAINER:
737 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 735 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
738 break; 736 break;
739 case SKILL: 737 case SKILL:
740 default: 738 default:
741 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 739 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
742 } 740 }
743 } 741 }
742
744 if (QUERY_FLAG (op, FLAG_UNPAID)) 743 if (QUERY_FLAG (op, FLAG_UNPAID))
745 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 744 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
746 745
747 return buf[use_buf]; 746 return buf [use_buf];
748} 747}
749 748
750/* 749/*
751 * query_base_name(object) returns a character pointer pointing to a static 750 * query_base_name(object) returns a character pointer pointing to a static
752 * buffer which contains a verbose textual representation of the name 751 * buffer which contains a verbose textual representation of the name
786 } 785 }
787 else 786 else
788 { 787 {
789#endif 788#endif
790 if (!plural) 789 if (!plural)
791 strcpy (buf, op->name); 790 assign (buf, op->name);
792 else 791 else
793 strcpy (buf, op->name_pl); 792 assign (buf, op->name_pl);
793
794 len = strlen (buf); 794 len = strlen (buf);
795#ifdef NEW_MATERIAL_CODE 795#ifdef NEW_MATERIAL_CODE
796 } 796 }
797#endif 797#endif
798 798
802 safe_strcat (buf, op->title, &len, MAX_BUF); 802 safe_strcat (buf, op->title, &len, MAX_BUF);
803 } 803 }
804 804
805 switch (op->type) 805 switch (op->type)
806 { 806 {
807 case SPELLBOOK: 807 case SPELLBOOK:
808 case SCROLL: 808 case SCROLL:
809 case WAND: 809 case WAND:
810 case ROD: 810 case ROD:
811 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 811 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
812 { 812 {
813 if (!op->title) 813 if (!op->title)
814 { 814 {
815 safe_strcat (buf, " of ", &len, MAX_BUF); 815 safe_strcat (buf, " of ", &len, MAX_BUF);
816 if (op->inv) 816 if (op->inv)
817 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 817 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
818 else 818 else
819 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 819 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
820 } 820 }
821 if (op->type != SPELLBOOK) 821 if (op->type != SPELLBOOK)
822 { 822 {
823 sprintf (buf2, " (lvl %d)", op->level); 823 sprintf (buf2, " (lvl %d)", op->level);
824 safe_strcat (buf, buf2, &len, MAX_BUF); 824 safe_strcat (buf, buf2, &len, MAX_BUF);
825 } 825 }
826 } 826 }
827 break; 827 break;
828 828
829 829
830 case SKILL: 830 case SKILL:
831 case AMULET: 831 case AMULET:
832 case RING: 832 case RING:
833 if (!op->title) 833 if (!op->title)
834 { 834 {
835 /* If ring has a title, full description isn't so useful */ 835 /* If ring has a title, full description isn't so useful */
836 char *s = ring_desc (op); 836 const char *s = ring_desc (op);
837 837
838 if (s[0]) 838 if (s[0])
839 { 839 {
840 safe_strcat (buf, " ", &len, MAX_BUF); 840 safe_strcat (buf, " ", &len, MAX_BUF);
841 safe_strcat (buf, s, &len, MAX_BUF); 841 safe_strcat (buf, s, &len, MAX_BUF);
842 } 842 }
843 } 843 }
844 break; 844 break;
845 default: 845 default:
846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
847 { 847 {
848 sprintf (buf + strlen (buf), " %+d", op->magic); 848 sprintf (buf + strlen (buf), " %+d", op->magic);
849 } 849 }
850 } 850 }
851
851 return buf; 852 return buf;
852} 853}
853 854
854/* Break this off from describe_item - that function was way 855/* Break this off from describe_item - that function was way
855 * too long, making it difficult to read. This function deals 856 * too long, making it difficult to read. This function deals
856 * with describing the monsters & players abilities. It should only 857 * with describing the monsters & players abilities. It should only
857 * be called with monster & player objects. Returns a description 858 * be called with monster & player objects. Returns a description
858 * in a static buffer. 859 * in a static buffer.
859 */ 860 */
860
861static char * 861static char *
862describe_monster (const object *op) 862describe_monster (const object *op)
863{ 863{
864 char buf[MAX_BUF]; 864 char buf[MAX_BUF];
865 static char retbuf[VERY_BIG_BUF]; 865 static char retbuf[VERY_BIG_BUF];
869 869
870 /* Note that the resolution this provides for players really isn't 870 /* Note that the resolution this provides for players really isn't
871 * very good. Any player with a speed greater than .67 will 871 * very good. Any player with a speed greater than .67 will
872 * fall into the 'lightning fast movement' category. 872 * fall into the 'lightning fast movement' category.
873 */ 873 */
874 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 874 if (op->has_active_speed ())
875 { 875 {
876 switch ((int) ((FABS (op->speed)) * 15)) 876 switch ((int) ((FABS (op->speed)) * 15))
877 { 877 {
878 case 0: 878 case 0:
879 strcat (retbuf, "(very slow movement)"); 879 strcat (retbuf, "(very slow movement)");
935 { 935 {
936 treasure *t; 936 treasure *t;
937 int first = 1; 937 int first = 1;
938 938
939 for (t = op->randomitems->items; t != NULL; t = t->next) 939 for (t = op->randomitems->items; t != NULL; t = t->next)
940 if (t->item && (t->item->clone.type == SPELL)) 940 if (t->item && t->item->clone.type == SPELL)
941 { 941 {
942 if (first) 942 if (first)
943 { 943 {
944 first = 0; 944 first = 0;
945 strcat (retbuf, "(Spell abilities:)"); 945 strcat (retbuf, "(Spell abilities:)");
991 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 991 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
992 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 992 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
993 break; 993 break;
994 994
995 if (tmp && tmp->attacktype != 0) 995 if (tmp && tmp->attacktype != 0)
996 {
997 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 996 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
998 }
999 else 997 else
1000 {
1001 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 998 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1002 }
1003 } 999 }
1004 else 1000 else
1005 {
1006 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1001 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1007 } 1002
1008 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1003 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1009 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1004 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1010 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1005 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1006
1011 for (i = 0; i < NROFATTACKS; i++) 1007 for (i = 0; i < NROFATTACKS; i++)
1012 {
1013 if (op->resist[i]) 1008 if (op->resist[i])
1014 { 1009 {
1015 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 1010 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1016 strcat (retbuf, buf); 1011 strcat (retbuf, buf);
1017 } 1012 }
1018 } 1013
1019 return retbuf; 1014 return retbuf;
1020} 1015}
1021 1016
1022 1017
1023/* 1018/*
1044 * 1039 *
1045 * Add 'owner' who is the person examining this object. 1040 * Add 'owner' who is the person examining this object.
1046 * owner can be null if no one is being associated with this 1041 * owner can be null if no one is being associated with this
1047 * item (eg, debug dump or the like) 1042 * item (eg, debug dump or the like)
1048 */ 1043 */
1049 1044const char *
1050char *
1051describe_item (const object *op, object *owner) 1045describe_item (const object *op, object *owner)
1052{ 1046{
1053 char buf[MAX_BUF]; 1047 char buf[MAX_BUF];
1054 static char retbuf[VERY_BIG_BUF]; 1048 static char retbuf[VERY_BIG_BUF];
1055 int identified, i; 1049 int identified, i;
1365 } 1359 }
1366 1360
1367 return retbuf; 1361 return retbuf;
1368} 1362}
1369 1363
1364std::string
1365object::describe_item (object *who)
1366{
1367 return std::string (::describe_item (this, who));
1368}
1369
1370/* Return true if the item is magical. A magical item is one that 1370/* Return true if the item is magical. A magical item is one that
1371 * increases/decreases any abilities, provides a resistance, 1371 * increases/decreases any abilities, provides a resistance,
1372 * has a generic magical bonus, or is an artifact. 1372 * has a generic magical bonus, or is an artifact.
1373 * This function is used by detect_magic to determine if an item 1373 * This function is used by detect_magic to determine if an item
1374 * should be marked as magical. 1374 * should be marked as magical.
1525 } 1525 }
1526 } 1526 }
1527 1527
1528 /* If the object is on a map, make sure we update its face */ 1528 /* If the object is on a map, make sure we update its face */
1529 if (op->map) 1529 if (op->map)
1530 update_object (op, UP_OBJ_FACE); 1530 update_object (op, UP_OBJ_CHANGE);
1531 else 1531 else
1532 { 1532 {
1533 pl = op->in_player (); 1533 pl = op->in_player ();
1534 if (pl) 1534 if (pl)
1535 /* A lot of the values can change from an update - might as well send 1535 /* A lot of the values can change from an update - might as well send

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines