If there are multiple matches to the "?/" describe command, then

they will be displayed in a menu, which the user can select from.
Menu entries for monsters will be given the same color as the monster,
with the monster's symbol added to the end of the string.

Entering a single character as input to the "?/" describe command lists
all monsters with that display symbol.

Monsters sharing the same display symbol can now have the same string
appended or prepended to their description (implemented to make the
"?/" command have to deal with less special cases).  Currently only
used by nagas with __N_suffix.  Has the side-effect advantage that
the naga subspicies description and the "attractive/repulsive"
description goes before the big block of quoted text, rather than after
it.


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

1 files changed, 5 insertions, 1 deletions

diff --git a/crawl-ref/source/database.h b/crawl-ref/source/database.h
index b30d8814e6..357ab62a9a 100644
--- a/crawl-ref/source/database.h
+++ b/crawl-ref/source/database.h
@@ -43,9 +43,13 @@ datum database_fetch(DBM *database, const std::string &key);
 std::vector<std::string> database_find_keys(DBM *database,
                                             const std::string &regex,
                                             bool ignore_case = false);
+std::vector<std::string> database_find_bodies(DBM *database,
+                                              const std::string &regex,
+                                              bool ignore_case = false);
 
 std::string              getLongDescription(const std::string &key);
-std::vector<std::string> getLongDescriptionByRegex(const std::string &regex);
+std::vector<std::string> getLongDescKeysByRegex(const std::string &regex);
+std::vector<std::string> getLongDescBodiesByRegex(const std::string &regex);
 
 std::string getShoutString(const std::string &monst,
                            const std::string &suffix = "");