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/delay.h | |
| 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/delay.h')
| -rw-r--r-- | crawl-ref/source/delay.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/delay.h b/crawl-ref/source/delay.h index adf2830ebb..25dd20a3b2 100644 --- a/crawl-ref/source/delay.h +++ b/crawl-ref/source/delay.h @@ -38,7 +38,7 @@ struct activity_interrupt_data : apt(AIP_STRING), data(s), context(SC_NONE) { } - activity_interrupt_data(const std::string &s) + activity_interrupt_data(const string &s) : apt(AIP_STRING), data(s.c_str()), context(SC_NONE) { } @@ -86,15 +86,15 @@ void handle_interrupted_swap(bool swap_if_safe = false, void clear_macro_process_key_delay(); -activity_interrupt_type get_activity_interrupt(const std::string &); +activity_interrupt_type get_activity_interrupt(const string &); bool is_delay_interruptible(delay_type delay); const char *delay_name(int delay); -delay_type get_delay(const std::string &); +delay_type get_delay(const string &); void autotoggle_autopickup(bool off); bool interrupt_activity(activity_interrupt_type ai, const activity_interrupt_data &a = activity_interrupt_data(), - std::vector<std::string>* msgs_buf = NULL); + vector<string>* msgs_buf = NULL); #endif |