diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 07:29:40 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 07:29:40 +0000 |
| commit | 7b6e06e7dfb876a56c99e2216a6071e0a652caf9 (patch) | |
| tree | 6126035ebe8c10f89ec930992bfa2e0e99c7dc17 /crawl-ref/source/player.cc | |
| parent | a9c18d8a40084b269f6173ba68283c3a2feaff48 (diff) | |
| download | crawl-ref-7b6e06e7dfb876a56c99e2216a6071e0a652caf9.tar.gz crawl-ref-7b6e06e7dfb876a56c99e2216a6071e0a652caf9.zip | |
Apply r6627, r6635, r6638 and r6645 (among others) to 0.4.
Fixes Selective Amnesia crash, claws/ankus in the weapon option, randart
bardings pretending to be boots and smaller stuff.
Includes indication of monsters seeing/sensing invisible.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6665 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 1611f4330e..e6c9d84a28 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1546,12 +1546,12 @@ int player_res_poison(bool calc_unid, bool temp, bool items) // mutations: rp += player_mutation_level(MUT_POISON_RESISTANCE); + // Only thirsty vampires are naturally poison resistant. + if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED) + rp++; + if (temp) { - // Only thirsty vampires are naturally poison resistant. - if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED) - rp++; - // spells: if (you.duration[DUR_RESIST_POISON] > 0) rp++; |