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/spl-miscast.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/spl-miscast.h')
-rw-r--r-- | crawl-ref/source/spl-miscast.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/crawl-ref/source/spl-miscast.h b/crawl-ref/source/spl-miscast.h index 347e578ca4..d3c9463103 100644 --- a/crawl-ref/source/spl-miscast.h +++ b/crawl-ref/source/spl-miscast.h @@ -26,20 +26,20 @@ class MiscastEffect { public: MiscastEffect(actor* _target, int _source, spell_type _spell, int _pow, - int _fail, std::string _cause = "", + int _fail, string _cause = "", nothing_happens_when_type _nothing_happens = NH_DEFAULT, int _lethality_margin = 0, - std::string _hand_str = "", bool _can_plural_hand = true); + string _hand_str = "", bool _can_plural_hand = true); MiscastEffect(actor* _target, int _source, spschool_flag_type _school, - int _level, std::string _cause, + int _level, string _cause, nothing_happens_when_type _nothing_happens = NH_DEFAULT, int _lethality_margin = 0, - std::string _hand_str = "", bool _can_plural_hand = true); + string _hand_str = "", bool _can_plural_hand = true); MiscastEffect(actor* _target, int _source, spschool_flag_type _school, - int _pow, int _fail, std::string _cause, + int _pow, int _fail, string _cause, nothing_happens_when_type _nothing_happens = NH_DEFAULT, int _lethality_margin = 0, - std::string _hand_str = "", bool _can_plural_hand = true); + string _hand_str = "", bool _can_plural_hand = true); ~MiscastEffect(); @@ -50,7 +50,7 @@ private: actor* target; int source; - std::string cause; + string cause; spell_type spell; spschool_flag_type school; @@ -67,7 +67,7 @@ private: int lethality_margin; - std::string hand_str; + string hand_str; bool can_plural_hand; int kill_source; @@ -79,11 +79,11 @@ private: bolt beam; - std::string all_msg; - std::string you_msg; - std::string mon_msg; - std::string mon_msg_seen; - std::string mon_msg_unseen; + string all_msg; + string you_msg; + string mon_msg; + string mon_msg_seen; + string mon_msg_unseen; msg_channel_type msg_ch; @@ -94,7 +94,7 @@ private: private: void init(); - std::string get_default_cause(bool attribute_to_user) const; + string get_default_cause(bool attribute_to_user) const; monster* target_as_monster() { |