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