ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.71 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.72 by root, Mon Mar 5 02:27:22 2007 UTC

3153 } 3153 }
3154 } 3154 }
3155 3155
3156 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3156 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3157 { 3157 {
3158 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3158 new_draw_info (NDI_UNIQUE, 0, who,
3159 "Equipping that combined with other items would consume your soul! "
3160 "[use the skills command to check your available item power]");
3159 return 1; 3161 return 1;
3160 } 3162 }
3161 3163
3162 3164
3163 /* Ok. We are now at the state where we can apply the new object. 3165 /* Ok. We are now at the state where we can apply the new object.
3164 * Note that we don't have the checks for can_use_... 3166 * Note that we don't have the checks for can_use_...
3165 * below - that is already taken care of by can_apply_object. 3167 * below - that is already taken care of by can_apply_object.
3166 */ 3168 */
3167
3168 3169
3169 if (op->nrof > 1) 3170 if (op->nrof > 1)
3170 tmp = get_split_ob (op, op->nrof - 1); 3171 tmp = get_split_ob (op, op->nrof - 1);
3171 else 3172 else
3172 tmp = NULL; 3173 tmp = NULL;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines