diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 22:56:45 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 22:56:45 +0000 |
| commit | 5e33fad9c14df165b32f3682af4b36b3db13c927 (patch) | |
| tree | 5ea5c00141774aa2fc7999b354d79172eac678d7 /crawl-ref/source/spells2.cc | |
| parent | 917a54724d684aa5310dddc77dd38b9fa542e7ce (diff) | |
| download | crawl-ref-5e33fad9c14df165b32f3682af4b36b3db13c927.tar.gz crawl-ref-5e33fad9c14df165b32f3682af4b36b3db13c927.zip | |
After some more thought, remove the god gift exceptions for
natural-phenomenon-type monsters. Fire vortices still need to be dealt
with properly, though.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5716 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index ebb3fe3c99..4346627113 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1842,9 +1842,7 @@ bool cast_tukimas_dance(int pow, bool god_gift, return (true); } -// God gift exception: Ball lightning is a natural phenomenon treated as -// a monster, so don't mark it as a god gift. -bool cast_conjure_ball_lightning(int pow) +bool cast_conjure_ball_lightning(int pow, bool god_gift) { bool success = false; @@ -1875,7 +1873,8 @@ bool cast_conjure_ball_lightning(int pow) int monster = mons_place( mgen_data(MONS_BALL_LIGHTNING, BEH_FRIENDLY, 0, - coord_def(tx, ty), MHITNOT)); + coord_def(tx, ty), MHITNOT, + god_gift ? MG_GOD_GIFT : 0)); if (monster != -1) { |