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-spl.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-spl.cc')
| -rw-r--r-- | crawl-ref/source/tilereg-spl.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/crawl-ref/source/tilereg-spl.cc b/crawl-ref/source/tilereg-spl.cc index 20dcf5304c..5e770109f9 100644 --- a/crawl-ref/source/tilereg-spl.cc +++ b/crawl-ref/source/tilereg-spl.cc @@ -44,10 +44,8 @@ void SpellRegion::draw_tag() const spell_type spell = (spell_type) idx; char* failure = failure_rate_to_string(spell_fail(spell)); - std::string desc = make_stringf("%d MP %s (%s)", - spell_mana(spell), - spell_title(spell), - failure); + string desc = make_stringf("%d MP %s (%s)", spell_mana(spell), + spell_title(spell), failure); free(failure); draw_desc(desc.c_str()); } @@ -76,7 +74,7 @@ int SpellRegion::handle_mouse(MouseEvent &event) return 0; } -bool SpellRegion::update_tab_tip_text(std::string &tip, bool active) +bool SpellRegion::update_tab_tip_text(string &tip, bool active) { const char *prefix1 = active ? "" : "[L-Click] "; const char *prefix2 = active ? "" : " "; @@ -88,7 +86,7 @@ bool SpellRegion::update_tab_tip_text(std::string &tip, bool active) return true; } -bool SpellRegion::update_tip_text(std::string& tip) +bool SpellRegion::update_tip_text(string& tip) { if (m_cursor == NO_CURSOR) return false; @@ -98,7 +96,7 @@ bool SpellRegion::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 cast this spell right now."; else @@ -114,7 +112,7 @@ bool SpellRegion::update_tip_text(std::string& tip) return true; } -bool SpellRegion::update_alt_text(std::string &alt) +bool SpellRegion::update_alt_text(string &alt) { if (m_cursor == NO_CURSOR) return false; @@ -204,7 +202,7 @@ void SpellRegion::update() if (mx * my == 0) return; - const unsigned int max_spells = std::min(22, mx*my); + const unsigned int max_spells = min(22, mx*my); for (int i = 0; i < 52; ++i) { @@ -218,7 +216,7 @@ void SpellRegion::update() desc.idx = (int) spell; desc.quantity = spell_mana(spell); - std::string temp; + string temp; if (is_prevented_teleport(spell) || spell_is_uncastable(spell, temp) || spell_mana(spell) > you.magic_points) |