diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-16 22:23:42 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-16 22:23:42 +0000 |
| commit | 9b1cdaf406c3cefd731676c4c67043b6f1158e09 (patch) | |
| tree | 9d7b728ec34b4394dc45b7eb7c23415d119903c2 /crawl-ref/source/beam.cc | |
| parent | e5921968c3f1f4ba975bf381cde709f7770649d2 (diff) | |
| download | crawl-ref-9b1cdaf406c3cefd731676c4c67043b6f1158e09.tar.gz crawl-ref-9b1cdaf406c3cefd731676c4c67043b6f1158e09.zip | |
Fix 2819298: sling bullets not counting towards _ammo_count for slings
Fix 2822293: colour "slot restricted" darkgrey on % screen
Fix 2822279: polymorph other taking MR into account
Fix 2821651: berserking monsters respecting 't' orders
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10247 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index dd420adaad..6e7eb9c717 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3531,7 +3531,7 @@ bool bolt::misses_player() void bolt::affect_player_enchantment() { - if ((has_saving_throw() || flavour == BEAM_POLYMORPH) + if (has_saving_throw() && flavour != BEAM_POLYMORPH && you_resist_magic(ench_power)) { // You resisted it. @@ -4640,8 +4640,6 @@ bool bolt::has_saving_throw() const if (aimed_at_feet) return (false); - bool rc = true; - switch (flavour) { case BEAM_HASTE: @@ -4650,12 +4648,10 @@ bool bolt::has_saving_throw() const case BEAM_DISPEL_UNDEAD: case BEAM_ENSLAVE_SOUL: // has a different saving throw case BEAM_ENSLAVE_DEMON: // ditto - rc = false; - break; + return (false); default: - break; + return (true); } - return rc; } bool _ench_flavour_affects_monster(beam_type flavour, const monsters* mon) |