diff options
| author | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
| commit | 2057b86a740fdaf7c9879ee9c9bd7dd296685c73 (patch) | |
| tree | c1d9b88b860230dce07aa81a1ecd3a0b6c5917a1 /crawl-ref/source/species.cc | |
| parent | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (diff) | |
| parent | e7b95c8c9b3bd68a43ba0da89221226cd41dcc80 (diff) | |
| download | crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.tar.gz crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/source/dat/des/variable/mini_monsters.des
crawl-ref/source/enum.h
crawl-ref/source/itemprop.cc
crawl-ref/source/main.cc
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/newgame.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/rltiles/dc-player.txt
crawl-ref/source/spl-selfench.cc
crawl-ref/source/throw.cc
crawl-ref/source/tilepick-p.cc
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/species.cc')
| -rw-r--r-- | crawl-ref/source/species.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/species.cc b/crawl-ref/source/species.cc index 78e10c9588..761d00745d 100644 --- a/crawl-ref/source/species.cc +++ b/crawl-ref/source/species.cc @@ -51,7 +51,7 @@ species_type get_species(const int index) if (index < 0 || index >= ng_num_species()) return SP_UNKNOWN; - return (species_order[index]); + return species_order[index]; } static const char * Species_Abbrev_List[NUM_SPECIES] = @@ -252,6 +252,13 @@ bool species_likes_lava(species_type species) return (species == SP_LAVA_ORC); } +bool species_can_throw_large_rocks(species_type species) +{ + return (species == SP_OGRE + || species == SP_TROLL + || species == SP_FORMICID); +} + genus_type species_genus(species_type species) { switch (species) @@ -290,11 +297,6 @@ size_type species_size(species_type species, size_part_type psize) case SP_TROLL: return SIZE_LARGE; case SP_NAGA: - // Most of their body is on the ground giving them a low profile. - if (psize == PSIZE_TORSO || psize == PSIZE_PROFILE) - return SIZE_MEDIUM; - else - return SIZE_LARGE; case SP_CENTAUR: return ((psize == PSIZE_TORSO) ? SIZE_MEDIUM : SIZE_LARGE); case SP_HALFLING: |