diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 12:35:36 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 12:35:36 +0000 |
| commit | 7a0cf4fa055dbebc676db78dde82881be8a6e6af (patch) | |
| tree | 27b003fb1ae2982e2886f1a31975ab7a3be749cf /crawl-ref/source/initfile.cc | |
| parent | ab86f8464ed1b3f73f2e19e01a63089777d91c23 (diff) | |
| download | crawl-ref-7a0cf4fa055dbebc676db78dde82881be8a6e6af.tar.gz crawl-ref-7a0cf4fa055dbebc676db78dde82881be8a6e6af.zip | |
Fix 1931767: sort_menus not working for pickup menu
FR 1943597: Auto-inscribe god gifts with {god gift} including
Xom gifts. These inscriptions do not (yet?) get
cleared when the item is identified. Also, if it's
not yet possible, menu_colour should work for the
pickup menu, and init.txt should include a line
colouring "god gift".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4286 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 05babe80c1..d9a8d3603e 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -1532,6 +1532,15 @@ void game_options::set_menu_sort(std::string field) return; menu_sort_condition cond(field); + // Override existing values, if necessary. + for (unsigned int i = 0; i < sort_menus.size(); i++) + if (sort_menus[i].mtype == cond.mtype) + { + sort_menus[i].sort = cond.sort; + sort_menus[i].cmp = cond.cmp; + return; + } + sort_menus.push_back(cond); } |