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-mem.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-mem.cc')
| -rw-r--r-- | crawl-ref/source/tilereg-mem.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/tilereg-mem.cc b/crawl-ref/source/tilereg-mem.cc index 3ef7aa936b..a629a01abb 100644 --- a/crawl-ref/source/tilereg-mem.cc +++ b/crawl-ref/source/tilereg-mem.cc @@ -42,12 +42,12 @@ void MemoriseRegion::draw_tag() const spell_type spell = (spell_type) idx; char* failure = failure_rate_to_string(spell_fail(spell)); - std::string desc = make_stringf("%s (%s) %d/%d spell slot%s", - spell_title(spell), - failure, - spell_levels_required(spell), - player_spell_levels(), - spell_levels_required(spell) > 1 ? "s" : ""); + string desc = make_stringf("%s (%s) %d/%d spell slot%s", + spell_title(spell), + failure, + spell_levels_required(spell), + player_spell_levels(), + spell_levels_required(spell) > 1 ? "s" : ""); free(failure); draw_desc(desc.c_str()); } @@ -78,7 +78,7 @@ int MemoriseRegion::handle_mouse(MouseEvent &event) return 0; } -bool MemoriseRegion::update_tab_tip_text(std::string &tip, bool active) +bool MemoriseRegion::update_tab_tip_text(string &tip, bool active) { const char *prefix1 = active ? "" : "[L-Click] "; const char *prefix2 = active ? "" : " "; @@ -90,7 +90,7 @@ bool MemoriseRegion::update_tab_tip_text(std::string &tip, bool active) return true; } -bool MemoriseRegion::update_tip_text(std::string& tip) +bool MemoriseRegion::update_tip_text(string& tip) { if (m_cursor == NO_CURSOR) return false; @@ -100,7 +100,7 @@ bool MemoriseRegion::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 memorise this spell now."; else @@ -128,8 +128,8 @@ void MemoriseRegion::update() const unsigned int max_spells = mx * my; - std::vector<int> books; - std::vector<spell_type> spells = get_mem_spell_list(books); + vector<int> books; + vector<spell_type> spells = get_mem_spell_list(books); for (unsigned int i = 0; m_items.size() < max_spells && i < spells.size(); ++i) { |