summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/spells2.cc8
-rw-r--r--crawl-ref/source/spells3.h2
-rw-r--r--crawl-ref/source/xom.cc2
3 files changed, 5 insertions, 7 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index bff4189ff6..8e9bf686b3 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1056,10 +1056,9 @@ bool cast_sticks_to_snakes(int pow, god_type god)
|| wpn.sub_type == WPN_BLOWGUN))
{
// Upsizing Snakes to Brown Snakes as the base class for using
- // the really big sticks (so bonus applies really only to trolls,
- // ogres, and most importantly ogre magi). Still it's unlikely
- // any character is strong enough to bother lugging a few of
- // these around. -- bwr
+ // the really big sticks (so bonus applies really only to trolls
+ // and ogres). Still, it's unlikely any character is strong
+ // enough to bother lugging a few of these around. - bwr
if (item_mass(wpn) < 300)
mon = MONS_SNAKE;
@@ -1098,7 +1097,6 @@ bool cast_sticks_to_snakes(int pow, god_type god)
mprf("You create %s snake%s!",
count > 1 ? "some" : "a",
count > 1 ? "s" : "");
-
return (true);
}
diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h
index dc60cd6599..394918eea8 100644
--- a/crawl-ref/source/spells3.h
+++ b/crawl-ref/source/spells3.h
@@ -10,7 +10,7 @@
#ifndef SPELLS3_H
#define SPELLS3_H
-#include "itemprop.h" // from _raise_corpse()
+#include "itemprop.h" // from _raise_remains()
struct dist;
struct bolt;
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 067c069513..214924ffcc 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -851,7 +851,7 @@ static bool _choose_chaos_upgrade(const monsters* mon)
// God gifts from good gods will be protected by their god from
// being given chaos weapons, while other gods won't mind the help
- // in their servants killing the player.
+ // in their servants' killing the player.
if (is_good_god(mon->god))
return (false);