diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mutation.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/skills2.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 061aa25cf0..566cea8741 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -637,7 +637,7 @@ static talent _get_talent(ability_type ability, bool check_confused) if (you.species == SP_TROLL) failure -= 30; else if (player_genus(GENPC_DWARVEN) || you.species == SP_HILL_ORC - || you.species == SP_OGRE) + || player_genus(GENPC_OGRE)) { failure -= 10; } diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index b9a417cae1..4fc6f5df53 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -206,7 +206,7 @@ int calc_heavy_armour_penalty( bool random_factor ) heavy_armour++; break; case ARM_LARGE_SHIELD: - if (you.species == SP_OGRE || you.species == SP_TROLL + if (player_genus(GENPC_OGRE) || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN)) { if (you.skills[SK_SHIELDS] < maybe_random2(13, random_factor)) diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 148c927cca..b45503d917 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1461,7 +1461,7 @@ formatted_string describe_mutations() } // a bit more stuff - if (you.species == SP_OGRE || you.species == SP_TROLL + if (player_genus(GENPC_OGRE) || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN) { result += "Your body does not fit into most forms of armour." EOL; diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index cb7447e5ea..3974f059eb 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -844,7 +844,7 @@ static void _give_starting_food() { item.base_type = OBJ_FOOD; if (you.species == SP_HILL_ORC || you.species == SP_KOBOLD - || you.species == SP_OGRE || you.species == SP_TROLL) + || player_genus(GENPC_OGRE) || you.species == SP_TROLL) { item.sub_type = FOOD_MEAT_RATION; } diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index a46f9daebf..1a800e8a14 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2613,7 +2613,7 @@ std::string _status_mut_abilities() } //end switch - innate abilities // a bit more stuff - if (you.species == SP_OGRE || you.species == SP_TROLL + if (player_genus(GENPC_OGRE) || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN) { mutations.push_back("unfitting armour"); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index ee4899807d..b8bdfd1093 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4254,7 +4254,7 @@ std::string species_name(species_type speci, int level, bool genus, bool adj) } } } - else if (player_genus( GENPC_DWARVEN, speci )) + else if (player_genus(GENPC_DWARVEN, speci)) { if (adj) // doesn't care about species/genus res = "Dwarven"; diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index ad8f682423..cfd7ced794 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -2001,7 +2001,7 @@ std::string skill_title( unsigned char best_skill, unsigned char skill_lev, break; case SK_SPELLCASTING: - if (species == SP_OGRE) + if (player_genus(GENPC_OGRE)) { result = "Ogre-Mage"; break; diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 87f529fac8..4bdc390c61 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -371,7 +371,7 @@ int spell_fail(spell_type spell) case ARM_LARGE_SHIELD: // *BCR* Large chars now get a lower penalty for large shields - if (you.species == SP_OGRE || you.species == SP_TROLL + if (player_genus(GENPC_OGRE) || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN)) { chance += 20; |