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.h | |
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.h')
-rw-r--r-- | crawl-ref/source/species.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/species.h b/crawl-ref/source/species.h index 381300af75..ea448b072c 100644 --- a/crawl-ref/source/species.h +++ b/crawl-ref/source/species.h @@ -13,6 +13,7 @@ genus_type species_genus(species_type species); int species_has_claws(species_type species, bool mut_level = false); bool species_likes_water(species_type species); bool species_likes_lava(species_type species); +bool species_can_throw_large_rocks(species_type species); size_type species_size(species_type species, size_part_type psize = PSIZE_TORSO); |