diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-17 20:52:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-17 20:52:54 +0000 |
| commit | 4b806f77ff9f7da60fd0faf201b8ab83f76ce457 (patch) | |
| tree | c0ea487b56eb55ac5f4bb3929f85ec1e5a961213 /crawl-ref/source/spells2.cc | |
| parent | 4280b1792236d066241fd6c6f36e4900f032180a (diff) | |
| download | crawl-ref-4b806f77ff9f7da60fd0faf201b8ab83f76ce457.tar.gz crawl-ref-4b806f77ff9f7da60fd0faf201b8ab83f76ce457.zip | |
A number of small bug fixes:
* 2811005: unknown mimics being stabbable
* 2818709: restrict monsters picking up stuff to 2 items per turn
* 2820097: reintroduce prompts for firing _in the direction_ of allies
and fix message
* 2821462: returning from tutorial screen swallowing a keypress
* 2822771: fire elementals could be placed in shallow water
Also, Azrael is no longer generated in the Shoals/Swamp
Also, implement the second part of FR 2820876: Xom will no longer
confuse the player if there's adjacent deep water or lava. This
restriction doesn't apply if Xom is feeling nasty (penance or bored)
and there's also no checks for water/lava further away.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10255 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 13409640aa..efa10e4b85 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -725,7 +725,7 @@ bool vampiric_drain(int pow, const dist &vmove) god_conduct_trigger conducts[3]; disable_attack_conducts(conducts); - const bool success = !stop_attack_prompt(monster, false, false); + const bool success = !stop_attack_prompt(monster, false, you.pos()); if (success) { @@ -804,7 +804,7 @@ bool burn_freeze(int pow, beam_type flavour, monsters *monster) god_conduct_trigger conducts[3]; disable_attack_conducts(conducts); - const bool success = !stop_attack_prompt(monster, false, false); + const bool success = !stop_attack_prompt(monster, false, you.pos()); if (success) { |