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-util.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-util.h')
| -rw-r--r-- | crawl-ref/source/spl-util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h index fcedaa078c..8de4fff398 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -50,9 +50,9 @@ enum spell_highlight_colours bool is_valid_spell(spell_type spell); void init_spell_descs(void); void init_spell_name_cache(); -spell_type spell_by_name(std::string name, bool partial_match = false); +spell_type spell_by_name(string name, bool partial_match = false); -spschool_flag_type school_by_name(std::string name); +spschool_flag_type school_by_name(string name); int get_spell_slot_by_letter(char letter); int get_spell_letter(spell_type spell); @@ -93,7 +93,7 @@ typedef int cell_func(coord_def where, int pow, int aux, actor *agent); typedef int monster_func(monster* mon, int pow); typedef int cloud_func(coord_def where, int pow, int spreadrate, cloud_type type, const actor* agent, int colour, - std::string name, std::string tile, int excl_rad); + string name, string tile, int excl_rad); int apply_area_visible(cell_func cf, int power, actor *agent = NULL); @@ -108,7 +108,7 @@ void apply_area_cloud(cloud_func func, const coord_def& where, int pow, int number, cloud_type ctype, const actor *agent, int spread_rate = -1, int colour = -1, - std::string name = "", std::string tile = "", + string name = "", string tile = "", int excl_rad = -1); bool spell_direction(dist &spelld, bolt &pbolt, |