summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-mon.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/tilereg-mon.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/tilereg-mon.cc')
-rw-r--r--crawl-ref/source/tilereg-mon.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/tilereg-mon.cc b/crawl-ref/source/tilereg-mon.cc
index e424865ac4..7741aae1f6 100644
--- a/crawl-ref/source/tilereg-mon.cc
+++ b/crawl-ref/source/tilereg-mon.cc
@@ -36,10 +36,10 @@ void MonsterRegion::update()
return;
get_monster_info(m_mon_info);
- std::sort(m_mon_info.begin(), m_mon_info.end(),
+ sort(m_mon_info.begin(), m_mon_info.end(),
monster_info::less_than_wrapper);
- unsigned int num_mons = std::min(max_mons, m_mon_info.size());
+ unsigned int num_mons = min(max_mons, m_mon_info.size());
for (size_t i = 0; i < num_mons; ++i)
{
InventoryTile desc;
@@ -91,7 +91,7 @@ int MonsterRegion::handle_mouse(MouseEvent &event)
return 0;
}
-bool MonsterRegion::update_tip_text(std::string &tip)
+bool MonsterRegion::update_tip_text(string &tip)
{
if (m_cursor == NO_CURSOR)
return false;
@@ -104,12 +104,12 @@ bool MonsterRegion::update_tip_text(std::string &tip)
return tile_dungeon_tip(mon->pos, tip);
}
-bool MonsterRegion::update_tab_tip_text(std::string &tip, bool active)
+bool MonsterRegion::update_tab_tip_text(string &tip, bool active)
{
return false;
}
-bool MonsterRegion::update_alt_text(std::string &alt)
+bool MonsterRegion::update_alt_text(string &alt)
{
if (m_cursor == NO_CURSOR)
return false;
@@ -212,7 +212,7 @@ void MonsterRegion::draw_tag()
if (!mon)
return;
- std::string desc = mon->proper_name(DESC_A);
+ string desc = mon->proper_name(DESC_A);
draw_desc(desc.c_str());
}