diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-14 18:03:45 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-14 18:03:45 +0000 |
commit | 866686d5df24c38a2838f6f06ef9186b2c392a1c (patch) | |
tree | 979cbc53f2f8f4f7cc278facf0fbf3086e506c29 /crawl-ref/source/beam.cc | |
parent | 661eef8d4e4e4c19309a45aa154b5a2349371435 (diff) | |
download | crawl-ref-866686d5df24c38a2838f6f06ef9186b2c392a1c.tar.gz crawl-ref-866686d5df24c38a2838f6f06ef9186b2c392a1c.zip |
Add more god gift-related fixes. First, expand mgen_data::hostile_at()
to allow specifying more parameters, and merge it with
mgen_data::alert_hostile_at(), since their only difference after
expansion is the hostile monster's target. Second, if a god makes you
cast Fire Storm, any fire vortices produced will finally be marked as
god gifts. Third, for consistency, don't immediately alert
miscast-produced spatial vortices to your presence, since the
aforementioned fire vortices aren't.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5818 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 432b80175f..6172e1f1ae 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -60,6 +60,7 @@ #include "spells1.h" #include "spells3.h" #include "spells4.h" +#include "state.h" #include "stuff.h" #include "terrain.h" #include "traps.h" @@ -3501,9 +3502,13 @@ static void _affect_place_explosion_clouds(bolt &beam, int x, int y) if (grd[x][y] == DNGN_FLOOR && mgrd[x][y] == NON_MONSTER && one_chance_in(4)) { + const god_type god = + (crawl_state.is_god_acting()) ? crawl_state.which_god_acting() + : GOD_NO_GOD; + mons_place( mgen_data::hostile_at( - MONS_FIRE_VORTEX, coord_def(x, y))); + MONS_FIRE_VORTEX, coord_def(x, y), 0, 0, false, god)); } } } |