diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 16:27:56 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 16:27:56 +0000 |
| commit | 246efe28ab719f99c914ea755ff06765027d0d64 (patch) | |
| tree | ee7754887838f91448f7e337d90f655b974c41e4 | |
| parent | e300efbb103304b383a249c80a1f396a47c7c3a8 (diff) | |
| download | crawl-ref-246efe28ab719f99c914ea755ff06765027d0d64.tar.gz crawl-ref-246efe28ab719f99c914ea755ff06765027d0d64.zip | |
Apply trunk r6513 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6518 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/describe.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 1659657f03..9a130252d5 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1914,8 +1914,7 @@ std::string get_item_description( const item_def &item, bool verbose, description << "$$" << god_name(you.religion) << " opposes the use of " << "such an evil item."; } - - if (god_dislikes_item_handling(item)) + else if (god_dislikes_item_handling(item)) { description << "$$" << god_name(you.religion) << " disapproves of the " << "use of such an item."; @@ -2796,13 +2795,17 @@ static void _detailed_god_description(god_type which_god) textcolor(LIGHTGREY); cprintf(EOL); - std::string broken = get_god_powers(which_god); - if (!broken.empty()) + std::string broken; + if (which_god != GOD_NEMELEX_XOBEH) { - linebreak_string2(broken, width); - formatted_string::parse_block(broken, false).display(); - cprintf(EOL); - cprintf(EOL); + broken = get_god_powers(which_god); + if (!broken.empty()) + { + linebreak_string2(broken, width); + formatted_string::parse_block(broken, false).display(); + cprintf(EOL); + cprintf(EOL); + } } if (which_god != GOD_XOM) @@ -2861,10 +2864,8 @@ static void _detailed_god_description(god_type which_god) "card effects, potentially hazardous. High piety and " "Evocations skill help here, as the power of Nemelex' " "abilities is governed by Evocations instead of " - "Invocations." - EOL - "The type of the deck gifts strongly depends on the " - "dominating item class sacrificed:" EOL + "Invocations. The type of the deck gifts strongly " + "depends on the dominating item class sacrificed:" EOL " decks of Escape -- armour" EOL " decks of Destruction -- weapons and ammunition" EOL " decks of Dungeons -- jewellery, books, " |