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/dgn-overview.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/dgn-overview.h')
| -rw-r--r-- | crawl-ref/source/dgn-overview.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crawl-ref/source/dgn-overview.h b/crawl-ref/source/dgn-overview.h index a30e48a186..501299db9f 100644 --- a/crawl-ref/source/dgn-overview.h +++ b/crawl-ref/source/dgn-overview.h @@ -18,25 +18,22 @@ bool overview_knows_portal(branch_type portal); int overview_knows_num_portals(dungeon_feature_type portal); void display_overview(); bool unnotice_feature(const level_pos &pos); -std::string overview_description_string(bool display); +string overview_description_string(bool display); void enter_branch(branch_type branch, level_id from); /////////////////////////////////////////////////////////// -void set_level_exclusion_annotation(std::string str, +void set_level_exclusion_annotation(string str, level_id li = level_id::current()); void clear_level_exclusion_annotation(level_id li = level_id::current()); void set_unique_annotation(monster* mons, const level_id level = level_id::current()); void remove_unique_annotation(monster* mons); -std::string get_level_annotation(level_id li = level_id::current(), - bool skip_excl = false, - bool skip_uniq = false, - bool use_colour = false, - int colour = LIGHTRED); +string get_level_annotation(level_id li = level_id::current(), + bool skip_excl = false, bool skip_uniq = false, + bool use_colour = false, int colour = LIGHTRED); -bool level_annotation_has(std::string str, - level_id li = level_id::current()); +bool level_annotation_has(string str, level_id li = level_id::current()); void annotate_level(); void do_annotate(level_id& li); |