… | |
… | |
1085 | new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); |
1085 | new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); |
1086 | |
1086 | |
1087 | } |
1087 | } |
1088 | else |
1088 | else |
1089 | { |
1089 | { |
1090 | int duration = change_ability_duration (caster, spell_ob); |
1090 | int duration = change_ability_duration (spell_ob, caster); |
1091 | |
1091 | |
1092 | if (duration > force->duration) |
1092 | if (duration > force->duration) |
1093 | { |
1093 | { |
1094 | force->duration = duration; |
1094 | force->duration = duration; |
1095 | new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); |
1095 | new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); |
… | |
… | |
1419 | * items. |
1419 | * items. |
1420 | */ |
1420 | */ |
1421 | int |
1421 | int |
1422 | remove_curse (object *op, object *caster, object *spell) |
1422 | remove_curse (object *op, object *caster, object *spell) |
1423 | { |
1423 | { |
1424 | object *tmp; |
|
|
1425 | int success = 0, was_one = 0; |
1424 | int success = 0, was_one = 0; |
1426 | |
1425 | |
1427 | for (tmp = op->inv; tmp; tmp = tmp->below) |
1426 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1428 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && |
1427 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && |
1429 | ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || |
1428 | ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || |
1430 | (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) |
1429 | (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) |
1431 | { |
1430 | { |
1432 | was_one++; |
1431 | was_one++; |