diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 00:27:10 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 00:27:10 +0000 |
commit | a83003cc352db2c464b62d6a653152ba05838633 (patch) | |
tree | bbb54cde828c4fababf871a557d8552c64ce39c8 /crawl-ref/source/player.cc | |
parent | 0b0ada3bf7ce381077a96a67baa802f8616c6050 (diff) | |
download | crawl-ref-a83003cc352db2c464b62d6a653152ba05838633.tar.gz crawl-ref-a83003cc352db2c464b62d6a653152ba05838633.zip |
Fix Trog's Hand again, so that it consistently gives the same
regeneration rate.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9954 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r-- | crawl-ref/source/player.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 972ef52405..643da199f0 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1065,8 +1065,7 @@ int player_regen() // Before applying other effects, make sure that there's something // to heal. - if (rr < 1) - rr = 1; + rr = std::max(1, rr); // Healing depending on satiation. // The better-fed you are, the faster you heal. @@ -1094,9 +1093,9 @@ int player_regen() rr /= 3; } - // Trog's Hand. This overrides all healing reduction above. + // Trog's Hand. This overrides everything above. if (you.attribute[ATTR_DIVINE_REGENERATION]) - rr = std::max(100, rr); + rr = 100; return (rr); } |