diff options
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 4af5e1c088..36d5b1b638 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2363,9 +2363,11 @@ void describe_monsters(monsters& mons) if (mons_is_mimic(mons.type) && mons.type != MONS_GOLD_MIMIC) body << getLongDescription("mimic"); - else + else if (mons.type != MONS_PLAYER_GHOST) + { body << getLongDescription(mons.base_name(DESC_DBNAME, false), mons.type == MONS_DANCING_WEAPON); + } std::string symbol = ""; symbol += get_monster_data(mons.type)->showchar; @@ -3131,18 +3133,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); |