From 589963865e1c068acfac4616ee626afa18a0cb09 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 11 Jun 2009 00:28:42 +0000 Subject: Backport trunk r9954 to 0.5. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9955 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/player.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 1014f0b102..015c96b96a 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); } -- cgit v1.2.3-54-g00ecf