diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
| commit | 06f3895bacfc80c69dd1c3bbfa2d1857ecde165b (patch) | |
| tree | ea9c59532861b584dec95554aaaad310b1f31833 /crawl-ref/source/stash.cc | |
| parent | e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427 (diff) | |
| parent | 833bd72fba5a1c683a2391462986193e40d4d313 (diff) | |
| download | crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.tar.gz crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/fight.cc
crawl-ref/source/food.cc
crawl-ref/source/libutil.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-stuff.cc
crawl-ref/source/spl-damage.cc
Diffstat (limited to 'crawl-ref/source/stash.cc')
| -rw-r--r-- | crawl-ref/source/stash.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index af61bb35ec..a6707ee1d3 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -1890,8 +1890,8 @@ std::string ShopInfo::get_shop_item_name(const item_def& search_item) const return ""; } -void _stash_flatten_results(const std::vector<stash_search_result> &in, - std::vector<stash_search_result> &out) +static void _stash_flatten_results(const std::vector<stash_search_result> &in, + std::vector<stash_search_result> &out) { // Creates search results vector with at most one item in each entry out.clear(); |