| … | |
… | |
| 592 | { |
592 | { |
| 593 | /* for golems with race fields, we don't attack |
593 | /* for golems with race fields, we don't attack |
| 594 | * aligned races |
594 | * aligned races |
| 595 | */ |
595 | */ |
| 596 | |
596 | |
| 597 | if (victim->race && op->race && strstr (op->race, victim->race)) |
597 | if (victim->race && op->race && op->race.contains (victim->race)) |
| 598 | { |
598 | { |
| 599 | if (op->owner) |
599 | if (op->owner) |
| 600 | new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s avoids damaging %s.", &op->name, &victim->name); |
600 | new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s avoids damaging %s.", &op->name, &victim->name); |
| 601 | } |
601 | } |
| 602 | else if (victim == op->owner) |
602 | else if (victim == op->owner) |
| … | |
… | |
| 895 | } |
895 | } |
| 896 | |
896 | |
| 897 | summon_arch = lasttr->item; |
897 | summon_arch = lasttr->item; |
| 898 | nrof = lasttr->nrof; |
898 | nrof = lasttr->nrof; |
| 899 | } |
899 | } |
| 900 | else if (spell_ob->race && !strcmp (spell_ob->race, "GODCULTMON")) |
900 | else if (spell_ob->race == shstr_GODCULTMON) |
| 901 | { |
901 | { |
| 902 | object *god = find_god (determine_god (op)), *mon, *owner; |
902 | object *god = find_god (determine_god (op)), *mon, *owner; |
| 903 | int summon_level, tries; |
903 | int summon_level, tries; |
| 904 | |
904 | |
| 905 | if (!god && ((owner = op->owner) != NULL)) |
905 | if (!god && ((owner = op->owner) != NULL)) |
