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/place.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/place.h')
| -rw-r--r-- | crawl-ref/source/place.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/place.h b/crawl-ref/source/place.h index 0b4de6a3c1..078b18ccca 100644 --- a/crawl-ref/source/place.h +++ b/crawl-ref/source/place.h @@ -18,15 +18,15 @@ unsigned short get_packed_place(branch_type branch, int subdepth); branch_type place_branch(unsigned short place); int place_depth(unsigned short place); -std::string short_place_name(unsigned short place); -std::string short_place_name(level_id id); -std::string place_name(unsigned short place, bool long_name = false, - bool include_number = true); +string short_place_name(unsigned short place); +string short_place_name(level_id id); +string place_name(unsigned short place, bool long_name = false, + bool include_number = true); // Prepositional form of branch level name. For example, "in the // Abyss" or "on level 3 of the Main Dungeon". -std::string prep_branch_level_name(unsigned short packed_place); -std::string prep_branch_level_name(); +string prep_branch_level_name(unsigned short packed_place); +string prep_branch_level_name(); // Get some kind of "absolute depth" given the depth in the branch. // It's mostly the difficulty of a given level and the quality of items @@ -37,7 +37,7 @@ bool single_level_branch(branch_type branch); bool branch_allows_followers(branch_type branch); -std::vector<level_id> all_dungeon_ids(); +vector<level_id> all_dungeon_ids(); bool is_level_on_stack(level_id id); |