summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-abl.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-abl.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-abl.cc')
-rw-r--r--crawl-ref/source/tilereg-abl.cc24
1 files changed, 11 insertions, 13 deletions
diff --git a/crawl-ref/source/tilereg-abl.cc b/crawl-ref/source/tilereg-abl.cc
index 8426ac83a0..7f1de8d33a 100644
--- a/crawl-ref/source/tilereg-abl.cc
+++ b/crawl-ref/source/tilereg-abl.cc
@@ -43,9 +43,7 @@ void AbilityRegion::draw_tag()
const ability_type ability = (ability_type) idx;
char* failure = failure_rate_to_string(get_talent(ability, false).fail);
- std::string desc = make_stringf("%s (%s)",
- ability_name(ability),
- failure);
+ string desc = make_stringf("%s (%s)", ability_name(ability), failure);
free(failure);
draw_desc(desc.c_str());
}
@@ -75,7 +73,7 @@ int AbilityRegion::handle_mouse(MouseEvent &event)
return 0;
}
-bool AbilityRegion::update_tab_tip_text(std::string &tip, bool active)
+bool AbilityRegion::update_tab_tip_text(string &tip, bool active)
{
const char *prefix1 = active ? "" : "[L-Click] ";
const char *prefix2 = active ? "" : " ";
@@ -87,7 +85,7 @@ bool AbilityRegion::update_tab_tip_text(std::string &tip, bool active)
return true;
}
-bool AbilityRegion::update_tip_text(std::string& tip)
+bool AbilityRegion::update_tip_text(string& tip)
{
if (m_cursor == NO_CURSOR)
return false;
@@ -97,7 +95,7 @@ bool AbilityRegion::update_tip_text(std::string& tip)
return false;
int flag = m_items[item_idx].flag;
- std::vector<command_type> cmd;
+ vector<command_type> cmd;
if (flag & TILEI_FLAG_INVALID)
tip = "You cannot use this ability right now.";
else
@@ -116,7 +114,7 @@ bool AbilityRegion::update_tip_text(std::string& tip)
return true;
}
-bool AbilityRegion::update_alt_text(std::string &alt)
+bool AbilityRegion::update_alt_text(string &alt)
{
if (m_cursor == NO_CURSOR)
return false;
@@ -221,14 +219,14 @@ void AbilityRegion::update()
if (mx * my == 0)
return;
- const unsigned int max_abilities = std::min(get_max_slots(), mx*my);
+ const unsigned int max_abilities = min(get_max_slots(), mx*my);
- std::vector<talent> talents = your_talents(false, true);
+ vector<talent> talents = your_talents(false, true);
if (talents.empty())
return;
- std::vector<InventoryTile> m_zotdef;
- std::vector<InventoryTile> m_invoc;
+ vector<InventoryTile> m_zotdef;
+ vector<InventoryTile> m_invoc;
for (unsigned int i = 0; i < talents.size(); ++i)
{
@@ -243,7 +241,7 @@ void AbilityRegion::update()
return;
}
- for (std::vector<InventoryTile>::iterator it = m_zotdef.begin();
+ for (vector<InventoryTile>::iterator it = m_zotdef.begin();
it != m_zotdef.end(); it++)
{
m_items.push_back(*it);
@@ -251,7 +249,7 @@ void AbilityRegion::update()
return;
}
- for (std::vector<InventoryTile>::iterator it = m_invoc.begin();
+ for (vector<InventoryTile>::iterator it = m_invoc.begin();
it != m_invoc.end(); it++)
{
m_items.push_back(*it);