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/cloud.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/cloud.h')
| -rw-r--r-- | crawl-ref/source/cloud.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/cloud.h b/crawl-ref/source/cloud.h index b6d24991f9..ec1d90c555 100644 --- a/crawl-ref/source/cloud.h +++ b/crawl-ref/source/cloud.h @@ -22,12 +22,12 @@ void swap_clouds(coord_def p1, coord_def p2); void check_place_cloud(cloud_type cl_type, const coord_def& p, int lifetime, const actor *agent, int spread_rate = -1, int colour = -1, - std::string name = "", std::string tile = "", + string name = "", string tile = "", int excl_rad = -1); void place_cloud(cloud_type cl_type, const coord_def& ctarget, int cl_range, const actor *agent, - int spread_rate = -1, int colour = -1, std::string name = "", - std::string tile = "", int excl_rad = -1); + int spread_rate = -1, int colour = -1, string name = "", + string tile = "", int excl_rad = -1); void manage_clouds(void); @@ -39,8 +39,8 @@ int resist_fraction(int resist, int bonus_res = 0); int max_cloud_damage(cloud_type cl_type, int power = -1); int actor_apply_cloud(actor *act); -std::string cloud_name_at_index(int cloudno); -std::string cloud_type_name(cloud_type type, bool terse = true); +string cloud_name_at_index(int cloudno); +string cloud_type_name(cloud_type type, bool terse = true); int get_cloud_colour(int cloudno); coord_def get_cloud_originator(const coord_def& pos); |