summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-06 12:54:36 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-06 12:54:36 +0000
commit8b4814cda94ce0ba5d627b4ae572077dcf55ccda (patch)
treead912dbac17407d32bdaab7fbe668513983cd752 /crawl-ref/source/beam.cc
parentb2ea4771ba60b92574d31a7cbb628323a5eb8897 (diff)
downloadcrawl-ref-8b4814cda94ce0ba5d627b4ae572077dcf55ccda.tar.gz
crawl-ref-8b4814cda94ce0ba5d627b4ae572077dcf55ccda.zip
Fix 1986252: double "Blech! You need xy!" message
Fix 1966204: make non-amphibious undead capable of drowning or the equivalent thereof When you see a weapon with the returning ego return (to you or a monster) set the properties known along with the brand (because artefacts can't be id'd by throwing alone, anyway). This helps alleviate BR 1958616, but doesn't solve the problem with the curse status being unknown. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5499 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 7727b70f7d..870fc2bc59 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2685,7 +2685,7 @@ bool curare_hits_monster( const bolt &beam,
return (mondied);
}
-// actually poisons a monster (w/ message)
+// Actually poisons a monster (w/ message).
bool poison_monster( monsters *monster,
kill_category from_whom,
int levels,
@@ -2702,8 +2702,8 @@ bool poison_monster( monsters *monster,
monster->add_ench( mon_enchant(ENCH_POISON, levels, from_whom) );
const mon_enchant new_pois = monster->get_ench(ENCH_POISON);
- // actually do the poisoning
- // note: order important here
+ // Actually do the poisoning.
+ // Note: order important here.
if (verbose && new_pois.degree > old_pois.degree)
{
simple_monster_message( monster,
@@ -2711,14 +2711,14 @@ bool poison_monster( monsters *monster,
: " looks even sicker." );
}
- // finally, take care of deity preferences
+ // Finally, take care of deity preferences.
if (from_whom == KC_YOU)
did_god_conduct( DID_POISON, 5 + random2(3) );
return (new_pois.degree > old_pois.degree);
}
-// actually napalms a monster (w/ message)
+// Actually napalms a monster (w/ message).
void _sticky_flame_monster( int mn, kill_category who, int levels )
{
monsters *monster = &menv[mn];