* Fix 2862312: examination of items in shops not working after buying

               something
* FR 2836364 : Make controlled blink contaminate the player.
* Fix 2841232: display "very slow" in the % screen.
* FR 2858960 : Re-add mouseover descriptions for previously seen (but
               not detected) features out of sight, and for plain floor
               the stash description like when using 'x'.
* Disallow placement of corpses within walls, and allow rock worms to
  leave corpses elsewhere.
* Minor tweaks to the documentation.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10766 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index d5c8a27200..1586fd4b63 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2017,8 +2017,8 @@ static std::string _get_feature_description_wide(int feat)
 void get_feature_desc(const coord_def &pos, describe_info &inf)
 {
     const dungeon_feature_type feat = grd(pos);
-    std::string desc = feature_description(pos, false, DESC_CAP_A, false);
-    std::string db_name = grd(pos) == DNGN_ENTER_SHOP ? "A shop" : desc;
+    std::string desc      = feature_description(pos, false, DESC_CAP_A, false);
+    std::string db_name   = grd(pos) == DNGN_ENTER_SHOP ? "A shop" : desc;
     std::string long_desc = getLongDescription(db_name);
 
     inf.body << desc << ".$$";
@@ -2181,7 +2181,7 @@ static bool _describe_spells(const item_def &item)
 // Describes all items in the game.
 //
 //---------------------------------------------------------------
-void describe_item( item_def &item, bool allow_inscribe )
+void describe_item( item_def &item, bool allow_inscribe, bool shopping )
 {
     if (!is_valid_item(item))
         return;
@@ -2189,7 +2189,7 @@ void describe_item( item_def &item, bool allow_inscribe )
     while (true)
     {
         // Memorised spell while reading a spellbook.
-        if (you.turn_is_over)
+        if (you.turn_is_over && !shopping)
             return;
 
         const bool spells_shown = _show_item_description(item);
@@ -2200,8 +2200,10 @@ void describe_item( item_def &item, bool allow_inscribe )
             textcolor(LIGHTGREY);
 
             if (item.base_type == OBJ_BOOKS && in_inventory(item))
+            {
                 cprintf("Select a spell to read its description or to "
                         "memorize it.");
+            }
             else
                 cprintf("Select a spell to read its description.");