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-cast.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-cast.h')
| -rw-r--r-- | crawl-ref/source/spl-cast.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h index dc6ef2d02a..6b0e7c18ef 100644 --- a/crawl-ref/source/spl-cast.h +++ b/crawl-ref/source/spl-cast.h @@ -75,15 +75,15 @@ int failure_rate_colour(spell_type spell); int failure_rate_to_int(int fail); char* failure_rate_to_string(int fail); -std::string spell_power_string(spell_type spell, bool rod = false); -std::string spell_range_string(spell_type spell, bool rod = false); -std::string spell_schools_string(spell_type spell); -std::string spell_hunger_string(spell_type spell, bool rod = false); -std::string spell_noise_string(spell_type spell); +string spell_power_string(spell_type spell, bool rod = false); +string spell_range_string(spell_type spell, bool rod = false); +string spell_schools_string(spell_type spell); +string spell_hunger_string(spell_type spell, bool rod = false); +string spell_noise_string(spell_type spell); bool is_prevented_teleport(spell_type spell); -bool spell_is_uncastable(spell_type spell, std::string &message); -void spell_skills(spell_type spell, std::set<skill_type> &skills); +bool spell_is_uncastable(spell_type spell, string &message); +void spell_skills(spell_type spell, set<skill_type> &skills); #endif |