diff options
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index d210a64827..e75423ded2 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -15,10 +15,6 @@ #include <iomanip> #include <numeric> -#ifdef TARGET_OS_DOS -#include <conio.h> -#endif - #include "externs.h" #include "options.h" #include "species.h" @@ -2776,10 +2772,20 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf, inf.title = "A mimic"; } + // This is somewhat hackish, but it's a good way of over-riding monsters' + // descriptions in Lua vaults by using MonPropsMarker. This is also the + // method used by set_feature_desc_long, etc. {due} + if (mons.props.exists("description")) + inf.body << std::string(mons.props["description"]); // Don't get description for player ghosts. - if (mons.type != MONS_PLAYER_GHOST) + else if (mons.type != MONS_PLAYER_GHOST) inf.body << getLongDescription(db_name); - inf.quote = getQuoteString(db_name); + + // And quotes {due} + if (mons.props.exists("quote")) + inf.body << std::string(mons.props["quote"]); + else + inf.quote = getQuoteString(db_name); std::string symbol; symbol += get_monster_data(mons.type)->showchar; |