From ff6bdc3daff822e5b59b9fbb48b2f74a2d1d9c30 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 22 Oct 2007 11:00:16 +0000 Subject: Applying two patches by dolorous: 1817546: refix Beogh butchering crash 1817459: fix a couple of typos git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2515 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/dat/glass.des | 2 +- crawl-ref/source/it_use2.cc | 2 +- crawl-ref/source/item_use.cc | 8 ++++---- crawl-ref/source/mstuff2.cc | 2 +- crawl-ref/source/religion.cc | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crawl-ref/source/dat/glass.des b/crawl-ref/source/dat/glass.des index 3731eb9e25..7d7bd28039 100644 --- a/crawl-ref/source/dat/glass.des +++ b/crawl-ref/source/dat/glass.des @@ -66,7 +66,7 @@ MAP ENDMAP ##################################################################### -# A good item encased in *permanet* glass. If the player wants it, +# A good item encased in *permanent* glass. If the player wants it, # teleport control will be needed. NAME: item_on_display_b DEPTH: diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index 4826d4103a..81616c23b7 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -632,7 +632,7 @@ void unuse_randart(const item_def &item) you.redraw_magic_points = 1; if (!known[RAP_MAGICAL_POWER]) { - mprf("You feel you mana capacity %s.", proprt[RAP_EVASION] > 0? + mprf("You feel your mana capacity %s.", proprt[RAP_EVASION] > 0? "decrease" : "increase"); } } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 5fd1c638fe..2dcb74a054 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -427,7 +427,7 @@ void wield_effects(int item_wield_2, bool showMsgs) // inc_max_mp(13); calc_mp(); set_ident_flags( you.inv[item_wield_2], ISFLAG_EQ_WEAPON_MASK ); - mpr("You fell your mana capacity increase."); + mpr("You feel your mana capacity increase."); } else { @@ -2382,7 +2382,7 @@ void jewellery_wear_effects(item_def &item) break; case RING_MAGICAL_POWER: - mpr("You feel you mana capacity increase."); + mpr("You feel your mana capacity increase."); calc_mp(); if (artefact) fake_rap = RAP_MAGICAL_POWER; @@ -2722,7 +2722,7 @@ void jewellery_remove_effects(item_def &item) break; case RING_MAGICAL_POWER: - mpr("You feel you mana capacity decrease."); + mpr("You feel your mana capacity decrease."); // dec_max_mp(9); break; @@ -4011,7 +4011,7 @@ void use_randart(item_def &item) you.redraw_magic_points = 1; if (!known[RAP_MAGICAL_POWER]) { - mprf("You feel you mana capacity %s.", proprt[RAP_EVASION] > 0? + mprf("You feel your mana capacity %s.", proprt[RAP_EVASION] > 0? "increase" : "decrease"); randart_wpn_learn_prop(item, RAP_MAGICAL_POWER); } diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index a8561d17bb..aa57d71af4 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -145,7 +145,7 @@ void mons_trap(struct monsters *monster) case TRAP_TELEPORT: monster_teleport(monster, true); break; - // alarm trap aren't set off by hostile monsters, because that would + // alarm traps aren't set off by hostile monsters, because that would // be way too nasty for the player. case TRAP_ALARM: if (!mons_friendly(monster) || silenced(monster->x, monster->y)) diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 3129a0808c..172160cfe0 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -175,9 +175,9 @@ const char *sacrifice[NUM_GODS][3] = }, // Beogh { - " slowly crumble% into the ground." - " crumble% into the ground." - " disintegrate% into the ground." + " slowly crumble% into the ground.", + " crumble% into the ground.", + " disintegrate% into the ground.", } }; -- cgit v1.2.3-54-g00ecf