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/tilereg-map.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/tilereg-map.cc')
-rw-r--r-- | crawl-ref/source/tilereg-map.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/tilereg-map.cc b/crawl-ref/source/tilereg-map.cc index ed28e90b47..d09700a666 100644 --- a/crawl-ref/source/tilereg-map.cc +++ b/crawl-ref/source/tilereg-map.cc @@ -168,10 +168,10 @@ void MapRegion::set(const coord_def &gc, map_feature f) return; // Get map extents - m_min_gx = std::min(m_min_gx, gc.x); - m_max_gx = std::max(m_max_gx, gc.x); - m_min_gy = std::min(m_min_gy, gc.y); - m_max_gy = std::max(m_max_gy, gc.y); + m_min_gx = min(m_min_gx, gc.x); + m_max_gx = max(m_max_gx, gc.x); + m_min_gy = min(m_min_gy, gc.y); + m_max_gy = max(m_max_gy, gc.y); recenter(); } @@ -195,10 +195,10 @@ void MapRegion::update_bounds() if (f == MF_UNSEEN) continue; - m_min_gx = std::min(m_min_gx, x); - m_max_gx = std::max(m_max_gx, x); - m_min_gy = std::min(m_min_gy, y); - m_max_gy = std::max(m_max_gy, y); + m_min_gx = min(m_min_gx, x); + m_max_gx = max(m_max_gx, x); + m_min_gy = min(m_min_gy, y); + m_max_gy = max(m_max_gy, y); } recenter(); @@ -301,7 +301,7 @@ int MapRegion::handle_mouse(MouseEvent &event) } } -bool MapRegion::update_tip_text(std::string& tip) +bool MapRegion::update_tip_text(string& tip) { if (mouse_control::current_mode() != MOUSE_MODE_COMMAND) return false; |