diff options
author | Adam Borowski <kilobyte@angband.pl> | 2012-05-02 11:31:11 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2012-05-02 11:42:47 +0200 |
commit | 7d9430211110ae933509c8cfc8d325e0b964c0b1 (patch) | |
tree | 4597a143d3c007378876ab2c55f0596eee24e147 /crawl-ref/source/database.cc | |
parent | a601d65fc265daa11375d4e392f7b7c961c6c7c4 (diff) | |
download | crawl-ref-7d9430211110ae933509c8cfc8d325e0b964c0b1.tar.gz crawl-ref-7d9430211110ae933509c8cfc8d325e0b964c0b1.zip |
Move god lastnames to dat/database/ rather than dat/descript/
Transifex scripts assume the former all follow the desc rules, this one
follows the db ones.
Diffstat (limited to 'crawl-ref/source/database.cc')
-rw-r--r-- | crawl-ref/source/database.cc | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 0db98c9b01..6ed28fdae0 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -118,6 +118,7 @@ static TextDB AllDBs[] = TextDB("misc", "database/", "miscname.txt", // names for miscellaneous things + "godname.txt", // god-related names (mostly His Xomminess) NULL), TextDB("quotes", "descript/", @@ -640,20 +641,6 @@ static void _call_recursive_replacement(std::string &str, TextDB &db, int &num_replacements, int recursion_depth = 0); -static std::string _query_weighted_randomised(TextDB &db, - const std::string &key, - const std::string &suffix = "", - const int weight = -1) -{ - std::string result = _getWeightedString(db, key, suffix, weight); - if (result.empty()) - return ""; - - int num_replacements = 0; - _call_recursive_replacement(result, db, suffix, num_replacements); - return (result); -} - static std::string _getRandomisedStr(TextDB &db, const std::string &key, const std::string &suffix, int &num_replacements, @@ -766,12 +753,6 @@ std::string getLongDescription(const std::string &key) return unwrap_desc(_query_database(DescriptionDB, key, true, true)); } -// god names only -std::string getWeightedRandomisedDescription(const std::string &key) -{ - return _query_weighted_randomised(DescriptionDB, key); -} - std::vector<std::string> getLongDescKeysByRegex(const std::string ®ex, db_find_filter filter) { |