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/tiletex.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/tiletex.h')
| -rw-r--r-- | crawl-ref/source/tiletex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h index 95fd4607ed..c4d041ceb8 100644 --- a/crawl-ref/source/tiletex.h +++ b/crawl-ref/source/tiletex.h @@ -94,11 +94,11 @@ inline bool TilesTexture::get_coords(tileidx_t idx, int ofs_x, int ofs_y, int sy = pos_sy_adjust; if (ymin >= 0) - sy = std::max(ymin, sy); + sy = max(ymin, sy); int ey = pos_ey_adjust; if (ymax >= 0) - ey = std::min(ymax, ey); + ey = min(ymax, ey); // Nothing to draw. if (sy >= ey) |