summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ouch.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-27 16:43:21 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-27 16:43:21 +0000
commit0c7d47c22ef69e9ff065f835a5036245c0d750f4 (patch)
tree401e24c5963e5bb59f51fb7d9b1d4888d5e0453a /crawl-ref/source/ouch.cc
parentabf7c1d0cea6abcb088d42e0a79099eb30ff1423 (diff)
downloadcrawl-ref-0c7d47c22ef69e9ff065f835a5036245c0d750f4.tar.gz
crawl-ref-0c7d47c22ef69e9ff065f835a5036245c0d750f4.zip
Implemented dispel undead for monsters.
Cold resistance was broken, fixed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3349 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
-rw-r--r--crawl-ref/source/ouch.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index 2d7d5b5348..589973fcd3 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -131,19 +131,13 @@ int check_your_resists(int hurted, beam_type flavour)
case BEAM_COLD:
hurted = resist_adjust_damage(&you, flavour,
- player_res_fire(), hurted, true);
- resist = player_res_cold();
+ player_res_cold(), hurted, true);
if (hurted < original)
- {
canned_msg(MSG_YOU_RESIST);
- hurted /= (1 + (resist * resist));
- }
else if (hurted > original)
{
mpr("You feel a terrible chill!");
xom_is_stimulated(200);
- hurted *= 15;
- hurted /= 10;
}
break;