summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/stairs.h
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/stairs.h
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/stairs.h')
-rw-r--r--crawl-ref/source/stairs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/stairs.h b/crawl-ref/source/stairs.h
index caf1f7520b..fefed5a5c3 100644
--- a/crawl-ref/source/stairs.h
+++ b/crawl-ref/source/stairs.h
@@ -7,7 +7,7 @@
#define STAIRS_H
bool check_annotation_exclusion_warning();
-level_id stair_destination(dungeon_feature_type feat, const std::string &dst,
+level_id stair_destination(dungeon_feature_type feat, const string &dst,
bool for_real = false);
level_id stair_destination(coord_def pos, bool for_real = false);
void down_stairs(dungeon_feature_type force_stair = DNGN_UNSEEN);