From ce3948ab25120e7caf3d69d14f5eff0c4f11ff11 Mon Sep 17 00:00:00 2001
From: haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 4 Aug 2008 14:41:48 +0000
Subject: 2036429: better spacing on ^ screen.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6772 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/describe.cc | 18 ++++++------------
 crawl-ref/source/player.cc   |  2 +-
 crawl-ref/source/player.h    |  3 ++-
 3 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 2b8f4c1e41..ffdffd68c9 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3166,18 +3166,12 @@ void describe_god( god_type which_god, bool give_title )
     // Only give this additional information for worshippers.
     if (which_god == you.religion)
     {
-        if (you.religion == GOD_ZIN
-            || you.religion == GOD_SHINING_ONE
-            || you.religion == GOD_ELYVILON)
-        {
-            cgotoxy(1, bottom_line - 1, GOTO_CRT);
-        }
-        else
-            cgotoxy(1, bottom_line - 2, GOTO_CRT);
-
-        textcolor(LIGHTGREY);
-        cprintf(get_linebreak_string(_religion_help(which_god),
-                                     numcols).c_str());
+        std::string extra = get_linebreak_string(_religion_help(which_god),
+                                                 numcols).c_str();
+        cgotoxy(1, bottom_line - std::count(extra.begin(), extra.end(), '\n')-1,
+                GOTO_CRT);
+        textcolor(LIGHTGREY);        
+        cprintf( "%s", extra.c_str() );
     }
 
     cgotoxy(1, bottom_line);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index b19996612c..f2d4c89162 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -4212,7 +4212,7 @@ int player_mental_clarity(bool calc_unid, bool items)
     return ((ret > 3) ? 3 : ret);
 }
 
-bool wearing_amulet(char amulet, bool calc_unid)
+bool wearing_amulet(jewellery_type amulet, bool calc_unid)
 {
     if (amulet == AMU_CONTROLLED_FLIGHT
         && (you.duration[DUR_CONTROLLED_FLIGHT]
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index e1e40054f1..7103018c47 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -15,6 +15,7 @@
 #define PLAYER_H
 
 #include "externs.h"
+#include "itemprop.h"
 
 class monsters;
 struct item_def;
@@ -74,7 +75,7 @@ int player_wielded_item();
  * called from: ability - acr - fight - food - it_use2 - item_use - items -
  *              misc - mutation - ouch
  * *********************************************************************** */
-bool wearing_amulet(char which_am, bool calc_unid = true);
+bool wearing_amulet(jewellery_type which_am, bool calc_unid = true);
 
 
 /* ***********************************************************************
-- 
cgit v1.2.3-54-g00ecf