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.27 by root, Mon Apr 23 18:21:54 2007 UTC vs.
Revision 1.30 by root, Mon May 7 03:05:57 2007 UTC

48 * Basically, for the use/nonuse, the code does something like: 48 * Basically, for the use/nonuse, the code does something like:
49 * "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
50 */ 50 */
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 51Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {"body_range", "in your range slot", "in a human's range slot"}, 52 {"body_range", "in your range slot", "in a human's range slot"},
53 {"body_shield", "as a shield", "as a protective shield"},
54 {"body_combat", "as a combat weapon", "as a combat weapon"},
53 {"body_arm", "on your arm", "on a human's arm"}, 55 {"body_arm", "on your arm", "on a human's arm"},
54 {"body_torso", "on your body", "on a human's torso"}, 56 {"body_torso", "on your body", "on a human's torso"},
55 {"body_head", "on your head", "on a human's head"}, 57 {"body_head", "on your head", "on a human's head"},
56 {"body_neck", "around your neck", "around a humans neck"}, 58 {"body_neck", "around your neck", "around a humans neck"},
57 {"body_skill", "in your skill slot", "in a human's skill slot"}, 59 {"body_skill", "in your skill slot", "in a human's skill slot"},
712 { 714 {
713 case BOW: 715 case BOW:
714 case WAND: 716 case WAND:
715 case ROD: 717 case ROD:
716 case HORN: 718 case HORN:
717 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);
718 break; 720 break;
719 case WEAPON: 721 case WEAPON:
720 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);
721 break; 723 break;
722 case ARMOUR: 724 case ARMOUR:
723 case HELMET: 725 case HELMET:
724 case SHIELD: 726 case SHIELD:
725 case RING: 727 case RING:
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 }
851 852
852 return buf; 853 return buf;
853} 854}
854 855

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines