summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-15 19:15:18 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-15 19:15:18 +0000
commit84789445f8c4937c2930a0d67e602408c2605201 (patch)
treee658e700bfb92983c224591255221b90064604a1
parent4f4134873a991bf79bf2e85f000f0969f92ab0ab (diff)
downloadcrawl-ref-84789445f8c4937c2930a0d67e602408c2605201.tar.gz
crawl-ref-84789445f8c4937c2930a0d67e602408c2605201.zip
Self-affecting monster spells don't beam. [1852045]
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7257 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/beam.cc2
-rw-r--r--crawl-ref/source/mstuff2.cc4
2 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 690f508108..e1a24f427e 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1625,7 +1625,7 @@ void fire_beam(bolt &pbolt, item_def *item, bool drop_item)
#ifdef MISSILE_TRAILS_OFF
// mv: It's not optimal but is usually enough.
- if (!pbolt.is_beam || pbolt.is_enchantment())
+ if (!pbolt.is_beam)
viewwindow(true, false);
#endif
}
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index e969ee8869..6905849b14 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1375,7 +1375,6 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
beam.type = 0;
beam.flavour = BEAM_HASTE;
beam.thrower = KILL_MON_MISSILE;
- beam.is_beam = true;
break;
case SPELL_BACKLIGHT:
@@ -1514,7 +1513,6 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
beam.type = 0;
beam.flavour = BEAM_INVISIBILITY;
beam.thrower = KILL_MON;
- beam.is_beam = true;
break;
case SPELL_FIREBALL:
@@ -1569,7 +1567,6 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
beam.flavour = BEAM_HEALING;
beam.thrower = KILL_MON;
beam.hit = 25 + (power / 5);
- beam.is_beam = true;
break;
case SPELL_TELEPORT_SELF:
@@ -1577,7 +1574,6 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
beam.type = 0;
beam.flavour = BEAM_TELEPORT; // 6 is used by digging
beam.thrower = KILL_MON;
- beam.is_beam = true;
break;
case SPELL_TELEPORT_OTHER: