Fix randart jewellery always named "of Bugginess".

Fix pickup.lua trying to find a butcher tool if the wielded edged weapon
happens to be cursed.


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

1 files changed, 8 insertions, 7 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index a5115e9c9b..877f61d546 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2441,8 +2441,8 @@ static bool _print_god_abil_desc( int god, int numpower )
     const char* pmsg = god_gain_power_messages[god][numpower];
 
     // If no message then no power.
-    if ( !pmsg[0] )
-        return false;
+    if (!pmsg[0])
+        return (false);
 
     std::ostringstream buf;
 
@@ -2957,6 +2957,10 @@ void describe_god( god_type which_god, bool give_title )
             cprintf( "None." EOL );
     }
 
+    int bottom_line = get_number_of_lines();
+    if (bottom_line > 30)
+        bottom_line = 30;
+
     // Only give this additional information for worshippers.
     if (which_god == you.religion)
     {
@@ -2964,19 +2968,16 @@ void describe_god( god_type which_god, bool give_title )
             || you.religion == GOD_SHINING_ONE
             || you.religion == GOD_ELYVILON)
         {
-            cgotoxy(1, get_number_of_lines() - 1, GOTO_CRT);
+            cgotoxy(1, bottom_line - 1, GOTO_CRT);
         }
         else
-            cgotoxy(1, get_number_of_lines() - 2, GOTO_CRT);
+            cgotoxy(1, bottom_line - 2, GOTO_CRT);
 
         textcolor(LIGHTGRAY);
         cprintf(get_linebreak_string(_religion_help(which_god),
                                      numcols).c_str());
     }
 
-    int bottom_line = get_number_of_lines();
-    if (bottom_line > 30)
-        bottom_line = 30;
     cgotoxy(1, bottom_line-1);
     textcolor(LIGHTGRAY);
     formatted_string::parse_string(