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/coordit.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/coordit.cc')
-rw-r--r-- | crawl-ref/source/coordit.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/coordit.cc b/crawl-ref/source/coordit.cc index b084b17a4b..45f9598266 100644 --- a/crawl-ref/source/coordit.cc +++ b/crawl-ref/source/coordit.cc @@ -15,10 +15,10 @@ rectangle_iterator::rectangle_iterator(const coord_def& corner1, const coord_def& corner2) { - topleft.x = std::min(corner1.x, corner2.x); - topleft.y = std::min(corner1.y, corner2.y); // not really necessary - bottomright.x = std::max(corner1.x, corner2.x); - bottomright.y = std::max(corner1.y, corner2.y); + topleft.x = min(corner1.x, corner2.x); + topleft.y = min(corner1.y, corner2.y); // not really necessary + bottomright.x = max(corner1.x, corner2.x); + bottomright.y = max(corner1.y, corner2.y); current = topleft; } @@ -211,7 +211,7 @@ again: if (icur == iend) { // Advance to the next radius. - std::vector<coord_def> *tmp = vcur; + vector<coord_def> *tmp = vcur; vcur = vnear; vnear = vfar; vfar = tmp; |