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

Diff Legend

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