diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/chardump.h | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip | |
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/chardump.h')
| -rw-r--r-- | crawl-ref/source/chardump.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/chardump.h b/crawl-ref/source/chardump.h index 51a24ed07a..babed1f6df 100644 --- a/crawl-ref/source/chardump.h +++ b/crawl-ref/source/chardump.h @@ -25,14 +25,13 @@ enum item_origin_dump_selector }; class scorefile_entry; -std::string morgue_directory(); -bool dump_char(const std::string &fname, - bool full_id = false, +string morgue_directory(); +bool dump_char(const string &fname, bool full_id = false, const scorefile_entry *se = NULL); void dump_map(const char* fname, bool debug = false, bool dist = false); void dump_map(FILE *fp, bool debug = false, bool dist = false); void display_notes(); -std::string munge_description(std::string inStr); +string munge_description(string inStr); const char *hunger_level(void); #ifdef DGL_WHEREIS |