diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-05 10:29:43 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-05 10:29:43 +0000 |
| commit | cc387e25c2f28449894231041e213f1512d6a1f2 (patch) | |
| tree | 2450863cbf1c7657b0f33cd5d2e0cebf2882e22e | |
| parent | 1505951176f5b1e73c70cca45bb8c9fc95472c4c (diff) | |
| download | crawl-ref-cc387e25c2f28449894231041e213f1512d6a1f2.tar.gz crawl-ref-cc387e25c2f28449894231041e213f1512d6a1f2.zip | |
Trunk->0.3 merge of 2765.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2766 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/decks.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/dungeon.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/hiscores.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index e344e21cf9..ddc8f3829f 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1222,7 +1222,7 @@ static void genie_card(int power, deck_rarity_type rarity) { if ( coinflip() ) { - mpr("A genie takes forms and thunders: " + mpr("A genie takes form and thunders: " "\"Choose your reward, mortal!\""); more(); acquirement( OBJ_RANDOM, AQ_CARD_GENIE ); diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h index fc7f610f26..d67a99f2cb 100644 --- a/crawl-ref/source/dungeon.h +++ b/crawl-ref/source/dungeon.h @@ -128,7 +128,7 @@ struct dgn_region bool fully_contains(const coord_def &p) const { return (p.x > pos.x && p.x < pos.x + size.x - 1 - && p.y >= pos.y && p.y < pos.y + size.y - 1); + && p.y > pos.y && p.y < pos.y + size.y - 1); } bool overlaps(const dgn_region &other) const; diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 2a3c6b1902..de083a6752 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -1261,7 +1261,7 @@ scorefile_entry::character_description(death_desc_verbosity verbosity) const } else if (god != GOD_NO_GOD) { - // Not exactly the same as the religon screen, but + // Not exactly the same as the religion screen, but // good enough to fill this slot for now. snprintf( scratch, INFO_SIZE, "Was %s of %s%s", (piety > 160) ? "the Champion" : |