summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/losglobal.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/losglobal.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/losglobal.cc')
-rw-r--r--crawl-ref/source/losglobal.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/losglobal.cc b/crawl-ref/source/losglobal.cc
index 712bd826d8..56f4b25f2f 100644
--- a/crawl-ref/source/losglobal.cc
+++ b/crawl-ref/source/losglobal.cc
@@ -52,10 +52,10 @@ static void _save_los(los_def* los, los_type l)
// Opacity at p has changed.
void invalidate_los_around(const coord_def& p)
{
- int x1 = std::max(p.x - LOS_MAX_RANGE, 0);
- int y1 = std::max(p.y - LOS_MAX_RANGE, 0);
- int x2 = std::min(p.x, GXM - 1);
- int y2 = std::min(p.y + LOS_MAX_RANGE, GYM - 1);
+ int x1 = max(p.x - LOS_MAX_RANGE, 0);
+ int y1 = max(p.y - LOS_MAX_RANGE, 0);
+ int x2 = min(p.x, GXM - 1);
+ int y2 = min(p.y + LOS_MAX_RANGE, GYM - 1);
for (int y = y1; y <= y2; y++)
for (int x = x1; x <= x2; x++)
if (sqr(p.x - x) + sqr(p.y - y) <= sqr(LOS_MAX_RANGE) + 1)