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-doll.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-doll.cc')
-rw-r--r-- | crawl-ref/source/tilereg-doll.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/tilereg-doll.cc b/crawl-ref/source/tilereg-doll.cc index 695bc453ca..827d64efdd 100644 --- a/crawl-ref/source/tilereg-doll.cc +++ b/crawl-ref/source/tilereg-doll.cc @@ -96,8 +96,7 @@ void DollEditRegion::render() const int item_line = 2; const int edit_doll_line = 5; const int doll_line = 8; - const int info_offset = - left_gutter + std::max(max_show, (int)NUM_MAX_DOLLS) + 1; + const int info_offset = left_gutter + max(max_show, (int)NUM_MAX_DOLLS) + 1; const int center_x = left_gutter + max_show / 2; @@ -132,7 +131,7 @@ void DollEditRegion::render() max_part = tile_player_count(idx) - 1; } - int show = std::min(max_show, max_part); + int show = min(max_show, max_part); int half_show = show / 2; for (int i = -half_show; i <= show - half_show; i++) { @@ -216,12 +215,12 @@ void DollEditRegion::render() glmanager->reset_transform(); - std::string item_str = part_name; + string item_str = part_name; float item_name_x = left_gutter * 32.0f; float item_name_y = (item_line + 1) * 32.0f; m_font_buf.add(item_str, VColour::white, item_name_x, item_name_y); - std::string doll_name; + string doll_name; doll_name = make_stringf("Doll index %d / %d", m_doll_idx, NUM_MAX_DOLLS - 1); float doll_name_x = left_gutter * 32.0f; float doll_name_y = (doll_line + 1) * 32.0f; @@ -259,7 +258,7 @@ void DollEditRegion::render() }; // Add current doll information: - std::string info_str; + string info_str; float info_x = info_offset * 32.0f; float info_y = 0.0f + m_font->char_height(); |