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