summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/transfor.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-28 18:46:28 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-28 18:46:28 +0000
commite0f370bd7ac3e1f97c72af235f24b8f65a7d02df (patch)
treefb2e9660cb44c2059916b5a4b7b671d1b5718326 /crawl-ref/source/transfor.cc
parentfe84ffe6b34c1ccc69e4ab4334d63c893d231f3a (diff)
downloadcrawl-ref-e0f370bd7ac3e1f97c72af235f24b8f65a7d02df.tar.gz
crawl-ref-e0f370bd7ac3e1f97c72af235f24b8f65a7d02df.zip
Transform fixes for trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2644 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/transfor.cc')
-rw-r--r--crawl-ref/source/transfor.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index f2a495fef1..8bcf271a64 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -584,8 +584,7 @@ void untransform(void)
if (you.species == SP_NAGA || you.species == SP_CENTAUR)
remove_one_equip(EQ_BOOTS);
- calc_hp();
- if (hp_downscale != 10)
+ if (hp_downscale != 10 && you.hp != you.hp_max)
{
you.hp = you.hp * 10 / hp_downscale;
if (you.hp < 1)
@@ -593,6 +592,7 @@ void untransform(void)
else if (you.hp > you.hp_max)
you.hp = you.hp_max;
}
+ calc_hp();
} // end untransform()
// XXX: This whole system is a mess as it still relies on special