[crawl-ref-commits] (branch: master) updated. 0.8.0-a0-4941-g7fcd5de

[Raphaël L. <ga...@us...>]

       via  7fcd5deea3fdaaa52e63cabe007f764293c55e02 (commit)
       via  e5b26695fd68881706ca2e06be1bd616a1aad25e (commit)
       via  0ab910c95d5cc7d42b33c9bfe06660bd9f8bd143 (commit)
      from  7d5a31bddd5e3dd001f288744046ee2fc8a36fcf (commit)

-----------------------------------------------------------------------
commit 7fcd5deea3fdaaa52e63cabe007f764293c55e02
Author: Raphael Langella <rap...@gm...>
Date:   Mon Jan 31 15:37:24 2011 +0100

    Fix message for using forbidden items ignoring armour and jewellery.
    
    This only affected Chei not warning you when putting on boots of running and
    amulet of rage.

commit e5b26695fd68881706ca2e06be1bd616a1aad25e
Author: Raphael Langella <rap...@gm...>
Date:   Mon Jan 31 14:32:49 2011 +0100

    Add wielded weapon to the training dummy tile.

commit 0ab910c95d5cc7d42b33c9bfe06660bd9f8bd143
Author: Raphael Langella <rap...@gm...>
Date:   Mon Jan 31 11:44:22 2011 +0100

    Fix wording.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/descript/spells.txt |    2 +-
 crawl-ref/source/player-equip.cc         |   12 +++++-------
 crawl-ref/source/tilemcache.cc           |    4 ++++
 crawl-ref/source/tileview.cc             |    2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index ebabc74..e05a9d2 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -318,7 +318,7 @@ This spell conjures forth a raging blizzard of ice, sleet and freezing gasses.
 %%%%
 Ignite Poison
 
-This spell attempts to convert all poison within the caster's view into liquid flame. It is very effective against poisonous creatures or those carrying poison potions. The caster nor his gear are not affected.
+This spell attempts to convert all poison within the caster's view into liquid flame. It is very effective against poisonous creatures or those carrying poison potions. The caster and his gear are not affected.
 %%%%
 Insulation
 
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index 03b93ca..11c2d59 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -108,6 +108,7 @@ static void _equip_armour_effect(item_def& arm, bool unmeld);
 static void _unequip_armour_effect(item_def& item, bool meld);
 static void _equip_jewellery_effect(item_def &item);
 static void _unequip_jewellery_effect(item_def &item, bool mesg);
+static void _equip_use_warning(const item_def& item);
 
 static void _equip_effect(equipment_type slot, int item_slot, bool unmeld,
                           bool msg)
@@ -122,6 +123,9 @@ static void _equip_effect(equipment_type slot, int item_slot, bool unmeld,
            || eq == EQ_RINGS
               && (slot == EQ_LEFT_RING || slot == EQ_RIGHT_RING));
 
+    if (msg)
+        _equip_use_warning(item);
+
     if (slot == EQ_WEAPON)
         _equip_weapon_effect(item, msg);
     else if (slot >= EQ_CLOAK && slot <= EQ_BODY_ARMOUR)
@@ -375,7 +379,7 @@ static void _unequip_artefact_effect(const item_def &item,
     }
 }
 
-static void _equip_weapon_use_warning(const item_def& item)
+static void _equip_use_warning(const item_def& item)
 {
     if (is_holy_item(item) && you.religion == GOD_YREDELEMNUL)
         mpr("You really shouldn't be using a holy item like this.");
@@ -446,9 +450,6 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs)
 
     case OBJ_STAVES:
     {
-        if (showMsgs)
-            _equip_weapon_use_warning(item);
-
         set_ident_flags(item, ISFLAG_KNOW_CURSE);
         if (item.sub_type == STAFF_POWER)
         {
@@ -487,9 +488,6 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs)
 
     case OBJ_WEAPONS:
     {
-        if (showMsgs)
-            _equip_weapon_use_warning(item);
-
         // Call unrandart equip func before item is identified.
         if (artefact)
             _equip_artefact_effect(item, &showMsgs);
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index af449f9..22ef6c5 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -515,6 +515,10 @@ bool mcache_monster::get_weapon_offset(tileidx_t mon_tile,
         *ofs_x = 2;
         *ofs_y = 3;
         break;
+    case TILEP_MONS_TRAINING_DUMMY:
+        *ofs_x = 3;
+        *ofs_y = 2;
+        break;
     case TILEP_MONS_ELF:
     case TILEP_MONS_ZOMBIE_LARGE:
         *ofs_x = 4;
diff --git a/crawl-ref/source/tileview.cc b/crawl-ref/source/tileview.cc
index 2889057..21f644f 100644
--- a/crawl-ref/source/tileview.cc
+++ b/crawl-ref/source/tileview.cc
@@ -658,7 +658,7 @@ void tile_place_monster(const coord_def &gc, const monster* mon)
                 env.tile_bg(ep) |= TILE_FLAG_CURSOR3;
         }
     }
-    else if (mons_is_stationary(mon))
+    else if (mons_is_stationary(mon) && mon->type != MONS_TRAINING_DUMMY)
     {
         // If necessary add item brand.
         if (you.visible_igrd(gc) != NON_ITEM)

-- 
Dungeon Crawl Stone Soup