diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-11 13:21:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-11 13:21:31 +0000 |
| commit | c6faa051c8f0f48d5922f9134e611d9ee675162d (patch) | |
| tree | 9cf7e520bcbac621f7143952450253f1fbeb4d39 /crawl-ref/source/beam.cc | |
| parent | 8af56c9f2d1a3e2ef9dbeae0b47263b47f00be42 (diff) | |
| download | crawl-ref-c6faa051c8f0f48d5922f9134e611d9ee675162d.tar.gz crawl-ref-c6faa051c8f0f48d5922f9134e611d9ee675162d.zip | |
Add lm_props.lua and appry recent commits.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6494 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 4726f60cc7..74fdd24a67 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -711,7 +711,7 @@ bool player_tracer( zap_type ztype, int power, bolt &pbolt, int range) if (pbolt.beam_cancelled) { #if DEBUG_DIAGNOSTICS - mprf(MSGCH_DIAGNOSTICS, "%s", "Beam stopped."); + mprf(MSGCH_DIAGNOSTICS, "%s", "Beam cancelled."); #endif canned_msg(MSG_OK); you.turn_is_over = false; @@ -3630,13 +3630,20 @@ static int _affect_player( bolt &beam, item_def *item ) if (YOU_KILL(beam.thrower)) { // Don't ask if we're aiming at ourselves. - if (!beam.aimed_at_feet && !beam.dont_stop_player - && !yesno("That beam is likely to hit yourself. Continue " - "anyway?", false, 'n')) + if (!beam.aimed_at_feet && !beam.dont_stop_player) { - beam.fr_count += 1; - beam.fr_power += you.experience_level; - beam.dont_stop_player = true; + if (yesno("That beam is likely to hit yourself. Continue " + "anyway?", false, 'n')) + { + beam.fr_count += 1; + beam.fr_power += you.experience_level; + beam.dont_stop_player = true; + } + else + { + beam.beam_cancelled = true; + return (BEAM_STOP); + } } } else if (beam.can_see_invis || !you.invisible() |