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/dungeon.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/dungeon.h')
| -rw-r--r-- | crawl-ref/source/dungeon.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h index 2ba3b4e893..4c3219e168 100644 --- a/crawl-ref/source/dungeon.h +++ b/crawl-ref/source/dungeon.h @@ -56,7 +56,7 @@ enum map_mask_type }; class dgn_region; -typedef std::vector<dgn_region> dgn_region_list; +typedef vector<dgn_region> dgn_region_list; class dgn_region { @@ -133,7 +133,7 @@ public: map_section_type orient; map_def map; - std::vector<coord_def> exits; + vector<coord_def> exits; int level_number; @@ -178,7 +178,7 @@ private: }; extern bool Generating_Level; -extern std::vector<vault_placement> Temp_Vaults; +extern vector<vault_placement> Temp_Vaults; extern const map_bitmask *Vault_Placement_Mask; @@ -250,7 +250,7 @@ void dgn_place_multiple_items(item_list &list, bool set_level_flags(uint32_t flags, bool silent = false); bool unset_level_flags(uint32_t flags, bool silent = false); -void dgn_set_branch_epilogue(branch_type br, std::string callback_name); +void dgn_set_branch_epilogue(branch_type br, string callback_name); void dgn_reset_level(bool enable_random_maps = true); @@ -292,7 +292,7 @@ static inline int count_neighbours(const coord_def& p, dungeon_feature_type feat return count_neighbours(p.x, p.y, feat); } -std::string dump_vault_maps(); +string dump_vault_maps(); bool dgn_square_travel_ok(const coord_def &c); |