summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-07-09 13:14:07 +0100
committerChris Campbell <chriscampbell89@gmail.com>2014-07-09 14:20:41 +0100
commit6895e532259536eafb5a5cac08ed7ccb1dfe9385 (patch)
tree3e391a5b8bef3dad990706e7b27fb3f58fbca609 /crawl-ref/source/player.cc
parentf36907521e4c5621adee179c95decac405dc06c6 (diff)
downloadcrawl-ref-6895e532259536eafb5a5cac08ed7ccb1dfe9385.tar.gz
crawl-ref-6895e532259536eafb5a5cac08ed7ccb1dfe9385.zip
Remove an unnecessary special case for Condensation Shield
Since it should now always melt when combined with Ring of Flames.
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d545c27e51..f562198872 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2741,11 +2741,8 @@ int player_shield_class()
if (you.duration[DUR_MAGIC_SHIELD])
shield += 900 + you.skill(SK_EVOCATIONS, 75);
- if (!you.duration[DUR_FIRE_SHIELD]
- && you.duration[DUR_CONDENSATION_SHIELD])
- {
+ if (you.duration[DUR_CONDENSATION_SHIELD])
shield += 800 + you.skill(SK_ICE_MAGIC, 60);
- }
}
if (you.duration[DUR_DIVINE_SHIELD])