diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-02 14:52:03 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-02 14:52:03 +0000 |
| commit | 9b45bfee5ce47aac0dbffdaae9c3d9bb45d2edc6 (patch) | |
| tree | 23eb0244aad0deae245eb6b68c1e22bfda1c5222 | |
| parent | eed564f133ab31498240ee40fe190a33d1983aac (diff) | |
| download | crawl-ref-9b45bfee5ce47aac0dbffdaae9c3d9bb45d2edc6.tar.gz crawl-ref-9b45bfee5ce47aac0dbffdaae9c3d9bb45d2edc6.zip | |
Apply trunk r6751 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6752 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/misc.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index f5be8ee92e..4e54fbdf75 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2673,7 +2673,8 @@ std::string your_hand(bool plural) case TRAN_NONE: case TRAN_STATUE: case TRAN_LICH: - result = you.has_usable_claws() ? "claw" : "hand"; + result = (you.has_usable_claws()) ? "claw" : "hand"; + break; case TRAN_ICE_BEAST: result = "hand"; break; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 04c37b846b..b50ea279e6 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6557,8 +6557,8 @@ int player::has_claws(bool allow_tran) const // these are the only other sources for claws if (species == SP_TROLL || species == SP_GHOUL) return 3; - else - return mutation[MUT_CLAWS]; + + return player_mutation_level(MUT_CLAWS); } bool player::has_usable_claws(bool allow_tran) const |