diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-22 15:25:58 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-22 15:25:58 +0000 |
| commit | dab15f3c44ae7bbf866bc85556b232c098b5d564 (patch) | |
| tree | f72edbf897be2d88b837986755d3960f3d05b6de | |
| parent | 27329b03ae50d453aab323ab8ee3b46523cc03c5 (diff) | |
| download | crawl-ref-dab15f3c44ae7bbf866bc85556b232c098b5d564.tar.gz crawl-ref-dab15f3c44ae7bbf866bc85556b232c098b5d564.zip | |
Fixed bug 1563452 (fireballs can be blocked by shields.) I think.
We should really have a proper bolt() copy constructor.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@71 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 467a197392..1f51515f11 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2902,6 +2902,7 @@ static bool handle_wand(struct monsters *monster, bolt &beem) beem.flavour = theBeam.flavour; beem.thrower = theBeam.thrower; beem.is_beam = theBeam.is_beam; + beem.is_explosion = theBeam.is_explosion; item_def item = mitm[ monster->inv[MSLOT_WAND] ]; diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index d4460a0697..bf309be117 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -698,6 +698,7 @@ void setup_mons_cast(struct monsters *monster, struct bolt &pbolt, int spell_cas pbolt.source_x = monster->x; pbolt.source_y = monster->y; pbolt.is_tracer = false; + pbolt.is_explosion = theBeam.is_explosion; if (pbolt.beam_name[0] && pbolt.beam_name[0] != '0') pbolt.aux_source = pbolt.beam_name; |