summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/show.cc
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/show.cc
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-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/show.cc')
-rw-r--r--crawl-ref/source/show.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc
index f8a98c38fe..9c870fc8b7 100644
--- a/crawl-ref/source/show.cc
+++ b/crawl-ref/source/show.cc
@@ -239,7 +239,7 @@ static void _update_item_at(const coord_def &gp)
}
else
{
- const std::vector<item_def> stash = item_list_in_stash(gp);
+ const vector<item_def> stash = item_list_in_stash(gp);
if (stash.empty())
return;
@@ -495,7 +495,7 @@ void show_update_emphasis()
// The only thing that can change is that previously unknown
// stairs are now known. (see is_unknown_stair(), emphasise())
LevelInfo& level_info = travel_cache.get_level_info(level_id::current());
- std::vector<stair_info> stairs = level_info.get_stairs();
+ vector<stair_info> stairs = level_info.get_stairs();
for (unsigned i = 0; i < stairs.size(); ++i)
if (stairs[i].destination.is_valid())
env.map_knowledge(stairs[i].position).flags &= ~MAP_EMPHASIZE;