diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-04-01 01:00:14 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-04-01 01:00:14 +0200 |
| commit | 452ff385766f7f82e4ff92f319dd3a284795fd2e (patch) | |
| tree | 35f3bfd02c4d16d05cda2126aaf82dd945690686 /crawl-ref/source/stash.h | |
| parent | 778a975c1cf474d6c585d2177956daff30cffc24 (diff) | |
| parent | 5485922b1f7b6c4e369d0b885ccfbff0e6e0d850 (diff) | |
| download | crawl-ref-452ff385766f7f82e4ff92f319dd3a284795fd2e.tar.gz crawl-ref-452ff385766f7f82e4ff92f319dd3a284795fd2e.zip | |
Merge branch 'unicode'.
There are some issues left, like incorrect wrapping in some cases, but
we can fix them later.
Diffstat (limited to 'crawl-ref/source/stash.h')
| -rw-r--r-- | crawl-ref/source/stash.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/crawl-ref/source/stash.h b/crawl-ref/source/stash.h index 8ed7167190..0cf0109832 100644 --- a/crawl-ref/source/stash.h +++ b/crawl-ref/source/stash.h @@ -9,7 +9,6 @@ #include "shopping.h" #include <string> -#include <iostream> #include <map> #include <vector> @@ -67,7 +66,7 @@ public: stash_search_result &res) const; - void write(std::ostream &os, int refx = 0, int refy = 0, + void write(FILE *f, int refx = 0, int refy = 0, std::string place = "", bool identify = false) const; @@ -138,7 +137,7 @@ public: bool show_menu(const level_pos &place, bool can_travel) const; bool is_visited() const { return items.size() || visited; } - void write(std::ostream &os, bool identify = false) const; + void write(FILE *f, bool identify = false) const; void reset() { items.clear(); visited = true; } void set_name(const std::string& s) { name = s; } @@ -244,8 +243,6 @@ struct stash_search_result } }; -extern std::ostream &operator << (std::ostream &, const Stash &); - class LevelStashes { public: @@ -287,7 +284,7 @@ public: void save(writer&) const; void load(reader&); - void write(std::ostream &os, bool identify = false) const; + void write(FILE *f, bool identify = false) const; std::string level_name() const; std::string short_level_name() const; @@ -315,8 +312,6 @@ public: friend class ST_ItemIterator; }; -extern std::ostream &operator << (std::ostream &, const LevelStashes &); - class StashTracker { public: @@ -372,7 +367,7 @@ public: void save(writer&) const; void load(reader&); - void write(std::ostream &os, bool identify = false) const; + void write(FILE *f, bool identify = false) const; void dump(const char *filename, bool identify = false) const; |