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.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.25 by root, Sun Mar 18 03:05:39 2007 UTC

… …
387 * returns a static array of the description. This can return 387 * returns a static array of the description. This can return
388 * a big buffer. 388 * a big buffer.
389 * if newline is true, we don't put parens around the description 389 * if newline is true, we don't put parens around the description
390 * but do put a newline at the end. Useful when dumping to files 390 * but do put a newline at the end. Useful when dumping to files
391 */ 391 */
392char * 392const char *
393describe_resistance (const object *op, int newline) 393describe_resistance (const object *op, int newline)
394{ 394{
395 static char buf[VERY_BIG_BUF]; 395 static char buf[VERY_BIG_BUF];
396 char buf1[VERY_BIG_BUF]; 396 char buf1[VERY_BIG_BUF];
397 int tmpvar; 397 int tmpvar;
… …
416/* 416/*
417 * query_weight(object) returns a character pointer to a static buffer 417 * query_weight(object) returns a character pointer to a static buffer
418 * containing the text-representation of the weight of the given object. 418 * containing the text-representation of the weight of the given object.
419 * The buffer will be overwritten by the next call to query_weight(). 419 * The buffer will be overwritten by the next call to query_weight().
420 */ 420 */
421 421const char *
422char *
423query_weight (const object *op) 422query_weight (const object *op)
424{ 423{
425 static char buf[10]; 424 static char buf[10];
426 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 425 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
427 426
428 if (op->weight < 0) 427 if (op->weight < 0)
429 return " "; 428 return " ";
429
430 if (i % 1000) 430 if (i % 1000)
431 sprintf (buf, "%6.1f", i / 1000.0); 431 sprintf (buf, "%6.1f", i / 1000.0);
432 else 432 else
433 sprintf (buf, "%4d ", i / 1000); 433 sprintf (buf, "%4d ", i / 1000);
434
434 return buf; 435 return buf;
435} 436}
436 437
437/* 438/*
438 * Returns the pointer to a static buffer containing 439 * Returns the pointer to a static buffer containing
439 * the number requested (of the form first, second, third...) 440 * the number requested (of the form first, second, third...)
440 */ 441 */
441 442const char *
442char *
443get_levelnumber (int i) 443get_levelnumber (int i)
444{ 444{
445 static char buf[MAX_BUF]; 445 static char buf[MAX_BUF];
446 446
447 if (i > 99) 447 if (i > 99)
448 { 448 {
449 sprintf (buf, "%d.", i); 449 sprintf (buf, "%d.", i);
450 return buf; 450 return buf;
451 } 451 }
452
452 if (i < 21) 453 if (i < 21)
453 return levelnumbers[i]; 454 return levelnumbers[i];
454 if (!(i % 10)) 455 if (!(i % 10))
455 return levelnumbers_10[i / 10]; 456 return levelnumbers_10[i / 10];
457
456 strcpy (buf, numbers_10[i / 10]); 458 strcpy (buf, numbers_10[i / 10]);
457 strcat (buf, levelnumbers[i % 10]); 459 strcat (buf, levelnumbers[i % 10]);
458 return buf; 460 return buf;
459} 461}
460
461 462
462/* 463/*
463 * get_number(integer) returns the text-representation of the given number 464 * get_number(integer) returns the text-representation of the given number
464 * in a static buffer. The buffer might be overwritten at the next 465 * in a static buffer. The buffer might be overwritten at the next
465 * call to get_number(). 466 * call to get_number().
466 * It is currently only used by the query_name() function. 467 * It is currently only used by the query_name() function.
467 */ 468 */
468 469const char *
469char *
470get_number (int i) 470get_number (int i)
471{ 471{
472 if (i <= 20) 472 if (i <= 20)
473 return numbers[i]; 473 return numbers[i];
474 else 474 else
… …
491 */ 491 */
492 492
493/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 493/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
494 * from stats.sp - b.t. 494 * from stats.sp - b.t.
495 */ 495 */
496char * 496const char *
497ring_desc (const object *op) 497ring_desc (const object *op)
498{ 498{
499 static char buf[VERY_BIG_BUF]; 499 static char buf[VERY_BIG_BUF];
500 int attr, val, len; 500 int attr, val, len;
501 501
… …
614 case AMULET: 614 case AMULET:
615 case RING: 615 case RING:
616 if (!op->title) 616 if (!op->title)
617 { 617 {
618 /* If ring has a title, full description isn't so useful */ 618 /* If ring has a title, full description isn't so useful */
619 char *s = ring_desc (op); 619 const char *s = ring_desc (op);
620 620
621 if (s[0]) 621 if (s[0])
622 { 622 {
623 safe_strcat (buf, " ", &len, HUGE_BUF); 623 safe_strcat (buf, " ", &len, HUGE_BUF);
624 safe_strcat (buf, s, &len, HUGE_BUF); 624 safe_strcat (buf, s, &len, HUGE_BUF);
… …
644 * 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
645 * returned is good forever.) However, it makes printing statements that 645 * returned is good forever.) However, it makes printing statements that
646 * 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.)
647 * 647 *
648 */ 648 */
649char * 649const char *
650query_name (const object *op) 650query_name (const object *op)
651{ 651{
652 static char buf[5][HUGE_BUF]; 652 static char buf[5][HUGE_BUF]; // OMFG
653 static int use_buf = 0; 653 static int use_buf = 0;
654 int len = 0; 654 int len = 0;
655 655
656#ifdef NEW_MATERIAL_CODE 656#ifdef NEW_MATERIAL_CODE
657 materialtype_t *mt; 657 materialtype_t *mt;
… …
684 if (QUERY_FLAG (op, FLAG_DAMNED)) 684 if (QUERY_FLAG (op, FLAG_DAMNED))
685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
686 else if (QUERY_FLAG (op, FLAG_CURSED)) 686 else if (QUERY_FLAG (op, FLAG_CURSED))
687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
688 } 688 }
689
689 /* 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),
690 * and it isn't identified, print out the fact that 691 * and it isn't identified, print out the fact that
691 * 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
692 * KNOWN_MAGICAL if the item actually is magical. 693 * KNOWN_MAGICAL if the item actually is magical.
693 * 694 *
… …
709 710
710 if (QUERY_FLAG (op, FLAG_APPLIED)) 711 if (QUERY_FLAG (op, FLAG_APPLIED))
711 { 712 {
712 switch (op->type) 713 switch (op->type)
713 { 714 {
714 case BOW: 715 case BOW:
715 case WAND: 716 case WAND:
716 case ROD: 717 case ROD:
717 case HORN: 718 case HORN:
718 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 719 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
719 break; 720 break;
720 case WEAPON: 721 case WEAPON:
721 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 722 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);
722 break; 723 break;
723 case ARMOUR: 724 case ARMOUR:
724 case HELMET: 725 case HELMET:
725 case SHIELD: 726 case SHIELD:
726 case RING: 727 case RING:
727 case BOOTS: 728 case BOOTS:
728 case GLOVES: 729 case GLOVES:
729 case AMULET: 730 case AMULET:
730 case GIRDLE: 731 case GIRDLE:
731 case BRACERS: 732 case BRACERS:
732 case CLOAK: 733 case CLOAK:
733 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 734 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
734 break; 735 break;
735 case CONTAINER: 736 case CONTAINER:
736 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 737 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
737 break; 738 break;
738 case SKILL: 739 case SKILL:
739 default: 740 default:
740 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 741 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
741 } 742 }
742 } 743 }
744
743 if (QUERY_FLAG (op, FLAG_UNPAID)) 745 if (QUERY_FLAG (op, FLAG_UNPAID))
744 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 746 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
745 747
746 return buf[use_buf]; 748 return buf [use_buf];
747} 749}
748 750
749/* 751/*
750 * 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
751 * buffer which contains a verbose textual representation of the name 753 * buffer which contains a verbose textual representation of the name
… …
785 } 787 }
786 else 788 else
787 { 789 {
788#endif 790#endif
789 if (!plural) 791 if (!plural)
790 strcpy (buf, op->name); 792 assign (buf, op->name);
791 else 793 else
792 strcpy (buf, op->name_pl); 794 assign (buf, op->name_pl);
795
793 len = strlen (buf); 796 len = strlen (buf);
794#ifdef NEW_MATERIAL_CODE 797#ifdef NEW_MATERIAL_CODE
795 } 798 }
796#endif 799#endif
797 800
… …
801 safe_strcat (buf, op->title, &len, MAX_BUF); 804 safe_strcat (buf, op->title, &len, MAX_BUF);
802 } 805 }
803 806
804 switch (op->type) 807 switch (op->type)
805 { 808 {
806 case SPELLBOOK: 809 case SPELLBOOK:
807 case SCROLL: 810 case SCROLL:
808 case WAND: 811 case WAND:
809 case ROD: 812 case ROD:
810 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))
811 { 814 {
812 if (!op->title) 815 if (!op->title)
813 { 816 {
814 safe_strcat (buf, " of ", &len, MAX_BUF); 817 safe_strcat (buf, " of ", &len, MAX_BUF);
815 if (op->inv) 818 if (op->inv)
816 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 819 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
817 else 820 else
818 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
819 } 822 }
820 if (op->type != SPELLBOOK) 823 if (op->type != SPELLBOOK)
821 { 824 {
822 sprintf (buf2, " (lvl %d)", op->level); 825 sprintf (buf2, " (lvl %d)", op->level);
823 safe_strcat (buf, buf2, &len, MAX_BUF); 826 safe_strcat (buf, buf2, &len, MAX_BUF);
824 } 827 }
825 } 828 }
826 break; 829 break;
827 830
828 831
829 case SKILL: 832 case SKILL:
830 case AMULET: 833 case AMULET:
831 case RING: 834 case RING:
832 if (!op->title) 835 if (!op->title)
833 { 836 {
834 /* If ring has a title, full description isn't so useful */ 837 /* If ring has a title, full description isn't so useful */
835 char *s = ring_desc (op); 838 const char *s = ring_desc (op);
836 839
837 if (s[0]) 840 if (s[0])
838 { 841 {
839 safe_strcat (buf, " ", &len, MAX_BUF); 842 safe_strcat (buf, " ", &len, MAX_BUF);
840 safe_strcat (buf, s, &len, MAX_BUF); 843 safe_strcat (buf, s, &len, MAX_BUF);
841 } 844 }
842 } 845 }
843 break; 846 break;
844 default: 847 default:
845 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 848 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
846 { 849 {
847 sprintf (buf + strlen (buf), " %+d", op->magic); 850 sprintf (buf + strlen (buf), " %+d", op->magic);
848 } 851 }
849 } 852 }
853
850 return buf; 854 return buf;
851} 855}
852 856
853/* Break this off from describe_item - that function was way 857/* Break this off from describe_item - that function was way
854 * too long, making it difficult to read. This function deals 858 * too long, making it difficult to read. This function deals
855 * with describing the monsters & players abilities. It should only 859 * with describing the monsters & players abilities. It should only
856 * be called with monster & player objects. Returns a description 860 * be called with monster & player objects. Returns a description
857 * in a static buffer. 861 * in a static buffer.
858 */ 862 */
859
860static char * 863static char *
861describe_monster (const object *op) 864describe_monster (const object *op)
862{ 865{
863 char buf[MAX_BUF]; 866 char buf[MAX_BUF];
864 static char retbuf[VERY_BIG_BUF]; 867 static char retbuf[VERY_BIG_BUF];
… …
990 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 993 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
991 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 994 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
992 break; 995 break;
993 996
994 if (tmp && tmp->attacktype != 0) 997 if (tmp && tmp->attacktype != 0)
995 {
996 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 998 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
997 }
998 else 999 else
999 {
1000 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1000 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1001 }
1002 } 1001 }
1003 else 1002 else
1004 {
1005 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1003 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1006 } 1004
1007 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1005 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1008 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1006 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1009 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1007 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1008
1010 for (i = 0; i < NROFATTACKS; i++) 1009 for (i = 0; i < NROFATTACKS; i++)
1011 {
1012 if (op->resist[i]) 1010 if (op->resist[i])
1013 { 1011 {
1014 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 1012 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1015 strcat (retbuf, buf); 1013 strcat (retbuf, buf);
1016 } 1014 }
1017 } 1015
1018 return retbuf; 1016 return retbuf;
1019} 1017}
1020 1018
1021 1019
1022/* 1020/*
… …
1043 * 1041 *
1044 * Add 'owner' who is the person examining this object. 1042 * Add 'owner' who is the person examining this object.
1045 * owner can be null if no one is being associated with this 1043 * owner can be null if no one is being associated with this
1046 * item (eg, debug dump or the like) 1044 * item (eg, debug dump or the like)
1047 */ 1045 */
1048 1046const char *
1049char *
1050describe_item (const object *op, object *owner) 1047describe_item (const object *op, object *owner)
1051{ 1048{
1052 char buf[MAX_BUF]; 1049 char buf[MAX_BUF];
1053 static char retbuf[VERY_BIG_BUF]; 1050 static char retbuf[VERY_BIG_BUF];
1054 int identified, i; 1051 int identified, i;
… …
1524 } 1521 }
1525 } 1522 }
1526 1523
1527 /* If the object is on a map, make sure we update its face */ 1524 /* If the object is on a map, make sure we update its face */
1528 if (op->map) 1525 if (op->map)
1529 update_object (op, UP_OBJ_FACE); 1526 update_object (op, UP_OBJ_CHANGE);
1530 else 1527 else
1531 { 1528 {
1532 pl = op->in_player (); 1529 pl = op->in_player ();
1533 if (pl) 1530 if (pl)
1534 /* A lot of the values can change from an update - might as well send 1531 /* A lot of the values can change from an update - might as well send

Diff Legend

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