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/ouch.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/ouch.h')
| -rw-r--r-- | crawl-ref/source/ouch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h index 74c1e25523..7180dd3d57 100644 --- a/crawl-ref/source/ouch.h +++ b/crawl-ref/source/ouch.h @@ -59,16 +59,16 @@ enum kill_method_type NUM_KILLBY }; -int check_your_resists(int hurted, beam_type flavour, std::string source, +int check_your_resists(int hurted, beam_type flavour, string source, bolt *beam = 0, bool doEffects = true); void splash_with_acid(int acid_strength, bool corrode_items = true, - std::string hurt_msg = ""); + string hurt_msg = ""); void weapon_acid(int acid_strength); class actor; int actor_to_death_source(const actor* agent); -std::string morgue_name(std::string char_name, time_t when_crawl_got_even); +string morgue_name(string char_name, time_t when_crawl_got_even); void reset_damage_counters(); void ouch(int dam, int death_source, kill_method_type death_type, @@ -83,6 +83,6 @@ bool expose_items_to_element(beam_type flavour, const coord_def& where, bool expose_player_to_element(beam_type flavour, int strength = 0, bool damage_inventory = true); -void screen_end_game(std::string text); +void screen_end_game(string text); int timescale_damage(const actor *act, int damage); #endif |