diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 19:20:33 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 19:20:33 +0000 |
| commit | a1dd025c4efbc80f6e56d03b66fabe005f87751f (patch) | |
| tree | 6a7c00cb6b0ea45e6e2f45a9c10957faa7769db0 /crawl-ref/source/beam.cc | |
| parent | f9b9c28845db9d3eb50ed242a14327305a617850 (diff) | |
| download | crawl-ref-a1dd025c4efbc80f6e56d03b66fabe005f87751f.tar.gz crawl-ref-a1dd025c4efbc80f6e56d03b66fabe005f87751f.zip | |
Update README files (courtesy of David), some minor tutorial
corrections, and make Xom ignore your attempts to amuse him by
deliberately casting spells at yourself. (Rebounding lightning bolts
will still amuse him.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6457 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index def9eea4b0..4726f60cc7 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3987,7 +3987,8 @@ static int _affect_player( bolt &beam, item_def *item ) if (beam.beam_source == NON_MONSTER) { // Beam from player rebounded and hit player. - xom_is_stimulated(255); + if (!beam.aimed_at_feet) + xom_is_stimulated(255); } else { @@ -4169,7 +4170,10 @@ static int _affect_player( bolt &beam, item_def *item ) // Xom's amusement at the player's being damaged is handled // elsewhere. if (beam.beam_source == NON_MONSTER) - xom_is_stimulated(255); + { + if (!beam.aimed_at_feet) + xom_is_stimulated(255); + } else if (was_affected) xom_is_stimulated(128); } |