| … | |
… | |
| 352 | |
352 | |
| 353 | /* No race, can't be invisible to it */ |
353 | /* No race, can't be invisible to it */ |
| 354 | if (!mon->race) |
354 | if (!mon->race) |
| 355 | return 0; |
355 | return 0; |
| 356 | |
356 | |
| 357 | if (strstr (mon->race, pl->contr->invis_race)) |
357 | if (mon->race.contains (pl->contr->invis_race)) |
| 358 | return 1; |
358 | return 1; |
| 359 | |
359 | |
| 360 | /* Nothing matched above, return 0 */ |
360 | /* Nothing matched above, return 0 */ |
| 361 | return 0; |
361 | return 0; |
| 362 | } |
362 | } |
| … | |
… | |
| 1637 | /* Basically, if race is set in the spell, then the creatures race must |
1637 | /* Basically, if race is set in the spell, then the creatures race must |
| 1638 | * match that. if the spell race is set to GOD, then the gods opposing |
1638 | * match that. if the spell race is set to GOD, then the gods opposing |
| 1639 | * race must match. |
1639 | * race must match. |
| 1640 | */ |
1640 | */ |
| 1641 | if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && |
1641 | if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && |
| 1642 | ((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) || |
1642 | ((!strcmp (spell->race, "GOD") && god && god->slaying && god->slaying.contains (tmp->race)) || |
| 1643 | (strstr (spell->race, tmp->race)))) |
1643 | spell->race.contains (tmp->race))) |
| 1644 | { |
1644 | { |
| 1645 | done_one = 2; |
1645 | done_one = 2; |
| 1646 | if (!detect) |
1646 | if (!detect) |
| 1647 | detect = tmp; |
1647 | detect = tmp; |
| 1648 | } |
1648 | } |
