diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 13:27:09 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 13:27:09 +0000 |
| commit | 968b72f7e415665bdb896fe3979f8049d69a930f (patch) | |
| tree | 601f2fc6bfd5ee5107148eb6c8597699d8951cb2 /crawl-ref/source/output.h | |
| parent | cfdd70607a856b8a37d64f86479ba2f7310f8a80 (diff) | |
| download | crawl-ref-968b72f7e415665bdb896fe3979f8049d69a930f.tar.gz crawl-ref-968b72f7e415665bdb896fe3979f8049d69a930f.zip | |
Fix 2018325 (compiling with gcc 4.3) by applying the patch by nathanj439.
Re-enable friendly pickup toggle for all characters and change wording
to make it clearer it may have no effect. (Fixes 2018493.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6557 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.h')
| -rw-r--r-- | crawl-ref/source/output.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h index abb0b72722..61e524a732 100644 --- a/crawl-ref/source/output.h +++ b/crawl-ref/source/output.h @@ -74,6 +74,9 @@ class monster_pane_info static bool less_than(const monster_pane_info& m1, const monster_pane_info& m2, bool zombified = true); + static bool less_than_wrapper(const monster_pane_info& m1, + const monster_pane_info& m2); + monster_pane_info(const monsters* m); void to_string(int count, std::string& desc, int& desc_color) const; |