diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2013-09-11 14:18:37 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2013-09-11 22:11:27 +0200 |
| commit | f5e63f43c5518824d410be6a8e25b9c22e293c8f (patch) | |
| tree | fd7cca96127addbc01638d6e83cf376d0bfb7914 /crawl-ref/source/database.cc | |
| parent | 0b360abc9b1ad0c4749b48cc7b2a85dc04b901e3 (diff) | |
| download | crawl-ref-f5e63f43c5518824d410be6a8e25b9c22e293c8f.tar.gz crawl-ref-f5e63f43c5518824d410be6a8e25b9c22e293c8f.zip | |
Move quotes back to their own resource file.
This commit partially reverts 45418d04c5e6913acaf493027d765c495609bdd
Diffstat (limited to 'crawl-ref/source/database.cc')
| -rw-r--r-- | crawl-ref/source/database.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index a9d70b4b9f..c5e5a3a5cc 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -120,6 +120,10 @@ static TextDB AllDBs[] = "godname.txt", // god-related names (mostly His Xomminess) NULL), + TextDB("quotes", "descript/", + "quotes.txt", // quotes for items and monsters + NULL), + TextDB("help", "database/", "help.txt", // database for outsourced help texts NULL), @@ -140,9 +144,10 @@ static TextDB& RandartDB = AllDBs[2]; static TextDB& SpeakDB = AllDBs[3]; static TextDB& ShoutDB = AllDBs[4]; static TextDB& MiscDB = AllDBs[5]; -static TextDB& HelpDB = AllDBs[6]; -static TextDB& FAQDB = AllDBs[7]; -static TextDB& HintsDB = AllDBs[8]; +static TextDB& QuotesDB = AllDBs[6]; +static TextDB& HelpDB = AllDBs[7]; +static TextDB& FAQDB = AllDBs[8]; +static TextDB& HintsDB = AllDBs[9]; static string _db_cache_path(string db, const char *lang) { @@ -751,7 +756,7 @@ static string _query_database(TextDB &db, string key, bool canonicalise_key, string getQuoteString(const string &key) { - return unwrap_desc(_query_database(DescriptionDB, key + ":quote", true, true)); + return unwrap_desc(_query_database(QuotesDB, key, true, true)); } ///////////////////////////////////////////////////////////////////////////// |