… | |
… | |
1115 | |
1115 | |
1116 | if (!target |
1116 | if (!target |
1117 | || target->flag [FLAG_REFL_SPELL] |
1117 | || target->flag [FLAG_REFL_SPELL] |
1118 | || (!god && spell->stats.grace) |
1118 | || (!god && spell->stats.grace) |
1119 | || (target->title && god && target->title == god->name) |
1119 | || (target->title && god && target->title == god->name) |
1120 | || (target->race && god && strstr (target->race, god->race))) |
1120 | || (target->race && god && target->race.contains (god->race))) |
1121 | { |
1121 | { |
1122 | new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); |
1122 | new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); |
1123 | return 0; |
1123 | return 0; |
1124 | } |
1124 | } |
1125 | |
1125 | |
… | |
… | |
1447 | * so even if the player doesn't worship a god, if race=GOD_.., it |
1447 | * so even if the player doesn't worship a god, if race=GOD_.., it |
1448 | * won't ever match anything. |
1448 | * won't ever match anything. |
1449 | */ |
1449 | */ |
1450 | if (!spell->race) |
1450 | if (!spell->race) |
1451 | race = NULL; |
1451 | race = NULL; |
1452 | else if (god && !strcmp (spell->race, "GOD_SLAYING")) |
1452 | else if (god && spell->race == shstr_GOD_SLAYING) |
1453 | race = god->slaying; |
1453 | race = god->slaying; |
1454 | else if (god && !strcmp (spell->race, "GOD_FRIEND")) |
1454 | else if (god && spell->race == shstr_GOD_FRIEND) |
1455 | race = god->race; |
1455 | race = god->race; |
1456 | else |
1456 | else |
1457 | race = spell->race; |
1457 | race = spell->race; |
1458 | |
1458 | |
1459 | unordered_mapwalk (op, -range, -range, range, range) |
1459 | unordered_mapwalk (op, -range, -range, range, range) |