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-title.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-title.cc')
-rw-r--r-- | crawl-ref/source/tilereg-title.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/tilereg-title.cc b/crawl-ref/source/tilereg-title.cc index 8e5b45faec..763b5187fb 100644 --- a/crawl-ref/source/tilereg-title.cc +++ b/crawl-ref/source/tilereg-title.cc @@ -8,9 +8,9 @@ #include "libutil.h" #include "macro.h" -static const std::string _get_title_image() +static const string _get_title_image() { - std::vector<std::string> files = get_title_files(); + vector<string> files = get_title_files(); return files[random2(files.size())]; } @@ -57,7 +57,7 @@ void TitleRegion::run() * We only want to show one line of message by default so clear the * font buffer before adding the new message. */ -void TitleRegion::update_message(std::string message) +void TitleRegion::update_message(string message) { m_font_buf.clear(); m_font_buf.add(message, VColour::white, 0, 0); |