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/terrain.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/terrain.h')
| -rw-r--r-- | crawl-ref/source/terrain.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/terrain.h b/crawl-ref/source/terrain.h index 2687a669cd..a969ca0d67 100644 --- a/crawl-ref/source/terrain.h +++ b/crawl-ref/source/terrain.h @@ -58,9 +58,9 @@ bool feat_is_travelable_stair(dungeon_feature_type feat); bool feat_is_escape_hatch(dungeon_feature_type feat); bool feat_is_gate(dungeon_feature_type feat); -std::string feat_preposition(dungeon_feature_type feat, bool active = false, - const actor* who = NULL); -std::string stair_climb_verb(dungeon_feature_type feat); +string feat_preposition(dungeon_feature_type feat, bool active = false, + const actor* who = NULL); +string stair_climb_verb(dungeon_feature_type feat); bool feat_is_water(dungeon_feature_type feat); bool feat_is_watery(dungeon_feature_type feat); @@ -77,8 +77,8 @@ bool feat_is_bidirectional_portal(dungeon_feature_type feat); bool feat_is_fountain(dungeon_feature_type feat); bool feat_is_reachable_past(dungeon_feature_type feat); void find_connected_identical(const coord_def& d, dungeon_feature_type ft, - std::set<coord_def>& out); -std::set<coord_def> connected_doors(const coord_def& d); + set<coord_def>& out); +set<coord_def> connected_doors(const coord_def& d); coord_def get_random_stair(); bool slime_wall_neighbour(const coord_def& c); @@ -123,11 +123,11 @@ bool is_valid_mimic_feat(dungeon_feature_type feat); bool feat_cannot_be_mimic(dungeon_feature_type feat); void init_feat_desc_cache(); -dungeon_feature_type feat_by_desc(std::string desc); +dungeon_feature_type feat_by_desc(string desc); const char* feat_type_name(dungeon_feature_type feat); -dungeon_feature_type dungeon_feature_by_name(const std::string &name); -std::vector<std::string> dungeon_feature_matches(const std::string &name); +dungeon_feature_type dungeon_feature_by_name(const string &name); +vector<string> dungeon_feature_matches(const string &name); const char *dungeon_feature_name(dungeon_feature_type rfeat); void nuke_wall(const coord_def& p); bool cell_is_clingable(const coord_def pos); |