diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-23 09:42:33 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-23 09:42:33 +0000 |
| commit | 70d644194b4b010383b4a5a264370e2cb291b693 (patch) | |
| tree | 7aa9a9bb56bc7d4b8f1690eb57313cde45c43712 /crawl-ref/source/database.cc | |
| parent | 974643d2eec4610d68ed781b91a01ecd461969f5 (diff) | |
| download | crawl-ref-70d644194b4b010383b4a5a264370e2cb291b693.tar.gz crawl-ref-70d644194b4b010383b4a5a264370e2cb291b693.zip | |
Replace the dire lajatang with the cloak of Starlight (rElec, rC+, EV+4,
Stlth-). I already added a new tile, which looks rather atrocious, I
think. The dire lajatang tile is now used for any branded lajatang.
Also renamed a few tile files.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4527 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/database.cc')
| -rw-r--r-- | crawl-ref/source/database.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 140051b4db..461e401d80 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -596,13 +596,16 @@ std::string getLongDescription(const std::string &key, bool noquote) if (!DescriptionDB.get()) return (""); + std::string result = ""; if (noquote) { - return _query_database(DescriptionDB.get(), key + " noquote", - true, true); + result = _query_database(DescriptionDB.get(), key + " noquote", + true, true); } + if (result.empty()) + result = _query_database(DescriptionDB.get(), key, true, true); - return _query_database(DescriptionDB.get(), key, true, true); + return result; } std::vector<std::string> getLongDescKeysByRegex(const std::string ®ex, |