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-skl.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-skl.cc')
| -rw-r--r-- | crawl-ref/source/tilereg-skl.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/tilereg-skl.cc b/crawl-ref/source/tilereg-skl.cc index 1e3592f317..de5b8ef873 100644 --- a/crawl-ref/source/tilereg-skl.cc +++ b/crawl-ref/source/tilereg-skl.cc @@ -42,13 +42,13 @@ void SkillRegion::draw_tag() const skill_type skill = (skill_type) idx; const int apt = species_apt(skill, you.species); - std::string progress = ""; + string progress = ""; - std::string desc = make_stringf("%-14s Skill %4.1f Aptitude %c%d", - skill_name(skill), - you.skill(skill, 10) / 10.0, - apt > 0 ? '+' : ' ', - apt); + string desc = make_stringf("%-14s Skill %4.1f Aptitude %c%d", + skill_name(skill), + you.skill(skill, 10) / 10.0, + apt > 0 ? '+' : ' ', + apt); draw_desc(desc.c_str()); } @@ -95,7 +95,7 @@ int SkillRegion::handle_mouse(MouseEvent &event) return 0; } -bool SkillRegion::update_tab_tip_text(std::string &tip, bool active) +bool SkillRegion::update_tab_tip_text(string &tip, bool active) { const char *prefix = active ? "" : "[L-Click] "; @@ -104,7 +104,7 @@ bool SkillRegion::update_tab_tip_text(std::string &tip, bool active) return true; } -bool SkillRegion::update_tip_text(std::string& tip) +bool SkillRegion::update_tip_text(string& tip) { if (m_cursor == NO_CURSOR) return false; @@ -136,7 +136,7 @@ bool SkillRegion::update_tip_text(std::string& tip) return true; } -bool SkillRegion::update_alt_text(std::string &alt) +bool SkillRegion::update_alt_text(string &alt) { if (m_cursor == NO_CURSOR) return false; |