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

Diff Legend

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