summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-22 09:25:33 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-22 09:25:33 +0000
commit1c7c5a0668701f48c72cb7ea20d567a7baca7847 (patch)
tree24d97f96b578b7322d1d6e2b79eca41e4191caf6
parent6adb570984828b2c36de2952c18e722641fbf802 (diff)
downloadcrawl-ref-1c7c5a0668701f48c72cb7ea20d567a7baca7847.tar.gz
crawl-ref-1c7c5a0668701f48c72cb7ea20d567a7baca7847.zip
Fixed 160093: too many shield interaction messages.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@454 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/delay.cc3
-rw-r--r--crawl-ref/source/misc.cc2
-rw-r--r--crawl-ref/source/overmap.cc2
3 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 6998a3df50..805a2ffff4 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -708,7 +708,8 @@ static void armour_wear_effects(const int item_slot)
if (item_cursed( arm ))
mpr( "Oops, that feels deathly cold." );
- warn_shield_penalties();
+ if (eq_slot == EQ_SHIELD)
+ warn_shield_penalties();
you.redraw_armour_class = 1;
you.redraw_evasion = 1;
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index c0567ef369..c0aa8783b0 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -835,7 +835,7 @@ void down_stairs( bool remove_stairs, int old_level, bool force )
&& stair_find < DNGN_RETURN_FROM_ORCISH_MINES))
{
// no idea why such a huge switch and not 100-grd[][]
- // planning ahead for re-organizaing grd[][] values - 13jan2000 {dlb}
+ // planning ahead for reorganizing grd[][] values - 13jan2000 {dlb}
strcpy( info, "Welcome to " );
switch (stair_find)
{
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc
index 2e4a236156..e569d90260 100644
--- a/crawl-ref/source/overmap.cc
+++ b/crawl-ref/source/overmap.cc
@@ -98,7 +98,7 @@ void init_overmap( void )
stair_level[i] = -1;
} // end init_overmap()
-void display_overmap( void )
+void display_overmap()
{
#ifdef DOS_TERM
char buffer[4800];