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-labyrinth.cc | |
| 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-labyrinth.cc')
| -rw-r--r-- | crawl-ref/source/dgn-labyrinth.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/dgn-labyrinth.cc b/crawl-ref/source/dgn-labyrinth.cc index 71ef54499d..c25595fa05 100644 --- a/crawl-ref/source/dgn-labyrinth.cc +++ b/crawl-ref/source/dgn-labyrinth.cc @@ -15,7 +15,7 @@ #include "mon-pathfind.h" #include "mon-place.h" -typedef std::list<coord_def> coord_list; +typedef list<coord_def> coord_list; struct dist_feat { @@ -32,7 +32,7 @@ static void _find_maze_neighbours(const coord_def &c, const dgn_region ®ion, coord_list &ns) { - std::vector<coord_def> coords; + vector<coord_def> coords; for (int yi = -2; yi <= 2; yi += 2) for (int xi = -2; xi <= 2; xi += 2) @@ -171,7 +171,7 @@ static void _change_walls_from_centre(const dgn_region ®ion, bool rectangular, unsigned mmask, dungeon_feature_type wall, - const std::vector<dist_feat> &ldist) + const vector<dist_feat> &ldist) { if (ldist.empty()) return; @@ -215,7 +215,7 @@ static void _change_walls_from_centre(const dgn_region ®ion, dungeon_feature_type wall, ...) { - std::vector<dist_feat> ldist; + vector<dist_feat> ldist; va_list args; va_start(args, wall); @@ -237,7 +237,7 @@ static void _change_walls_from_centre(const dgn_region ®ion, static void _place_extra_lab_minivaults() { - std::set<const map_def*> vaults_used; + set<const map_def*> vaults_used; while (true) { const map_def *vault = random_map_for_tag("lab", false); @@ -358,7 +358,7 @@ static void _labyrinth_add_blood_trail(const dgn_region ®ion) if (!mp.init_pathfind(dest, start)) continue; - const std::vector<coord_def> path = mp.backtrack(); + const vector<coord_def> path = mp.backtrack(); if (path.size() < 10) continue; |