summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-04 17:33:14 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-04 17:33:14 +0000
commit54374f6bcc0dd6e456823fc74e31a1b63a49d86e (patch)
treebe07306f65be465e2858d2cedeb7e33602317a59
parent77623e8d310eae4d66f878911b53e3e3f69ab486 (diff)
downloadcrawl-ref-54374f6bcc0dd6e456823fc74e31a1b63a49d86e.tar.gz
crawl-ref-54374f6bcc0dd6e456823fc74e31a1b63a49d86e.zip
Backport trunk r10094 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10095 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/acr.cc2
-rw-r--r--crawl-ref/source/enum.h2
-rw-r--r--crawl-ref/source/ghost.cc2
-rw-r--r--crawl-ref/source/libgui.cc2
-rw-r--r--crawl-ref/source/spl-data.h4
-rw-r--r--crawl-ref/source/tilereg.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 398d694231..1b93c7e1b6 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -308,7 +308,7 @@ static void _show_commandline_options_help()
puts("Command line options override init file options, which override");
puts("environment options (CRAWL_NAME, CRAWL_DIR, CRAWL_RC).");
puts("");
- puts("Highscore list options: (Can be redirected to more, etc)");
+ puts("Highscore list options: (Can be redirected to more, etc.)");
puts(" -scores [N] highscore list");
puts(" -tscores [N] terse highscore list");
puts(" -vscores [N] verbose highscore list");
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index e8512260f7..9ab40ac6e1 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2476,7 +2476,7 @@ enum score_format_type
{
SCORE_TERSE, // one line
SCORE_REGULAR, // two lines (name, cause, blank)
- SCORE_VERBOSE // everything (dates, times, god, etc)
+ SCORE_VERBOSE // everything (dates, times, god, etc.)
};
enum shop_type // (unsigned char) env.sh_type[], item_in_shop(), in_a_shop()
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 31f9f96fca..94ba365b08 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -148,7 +148,7 @@ void ghost_demon::init_random_demon()
{
name = make_name(random_int(), false);
- // hp - could be defined below (as could ev, AC etc). Oh well, too late:
+ // hp - could be defined below (as could ev, AC, etc.). Oh well, too late:
max_hp = 100 + roll_dice( 3, 50 );
ev = 5 + random2(20);
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index 0bb75f5b96..f199d7193d 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -194,7 +194,7 @@ void get_input_line_gui(char *const buff, int len)
k = prev;
break;
- // Escape conversion. (for ^H, etc)
+ // Escape conversion. (for ^H, etc.)
case CONTROL('V'):
kin = getch();
// fallthrough
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 99036db9f3..4673bda710 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -60,8 +60,8 @@
This is the fun stuff. Necromancy is a mixed bag of many and various
different kinds of spells, with a few common themes:
-Differentiation of living, dead and undead. Some necromancy affects only
- the living (pain, vampiric draining etc), some affects only the dead
- (animate dead, twisted resurrection etc), and some affects only undead
+ the living (pain, vampiric draining, etc.), some affects only the dead
+ (animate dead, twisted resurrection, etc.), and some affects only undead
(dispel and control undead).
-Actual or potential harm: eg risk in Death's Door, hp loss with Pain,
disease with summon greater undead, etc. Also loss of potential experience
diff --git a/crawl-ref/source/tilereg.h b/crawl-ref/source/tilereg.h
index 231c5c3efb..15c7d3a886 100644
--- a/crawl-ref/source/tilereg.h
+++ b/crawl-ref/source/tilereg.h
@@ -31,7 +31,7 @@ public:
FixedVector<TilesTexture, TEX_MAX> m_textures;
};
-// Windows and internal regions (text, dungeon, map, etc)
+// Windows and internal regions (text, dungeon, map, etc.)
class MouseEvent;
class Region