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/effects.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/effects.h')
| -rw-r--r-- | crawl-ref/source/effects.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h index 6d2b79ab80..a70404792d 100644 --- a/crawl-ref/source/effects.h +++ b/crawl-ref/source/effects.h @@ -12,7 +12,7 @@ struct bolt; class monster; struct item_def; -void banished(const std::string &who = ""); +void banished(const string &who = ""); bool forget_spell(void); @@ -27,7 +27,7 @@ int spawn_corpse_mushrooms(item_def& corpse, bool distance_as_time = false); struct mgen_data; -int place_ring(std::vector<coord_def>& ring_points, +int place_ring(vector<coord_def>& ring_points, const coord_def& origin, mgen_data prototype, int n_arcs, @@ -37,13 +37,13 @@ int place_ring(std::vector<coord_def>& ring_points, class los_base; // Collect lists of points that are within LOS (under the given losgrid), // unoccupied, and not solid (walls/statues). -void collect_radius_points(std::vector<std::vector<coord_def> > &radius_points, +void collect_radius_points(vector<vector<coord_def> > &radius_points, const coord_def &origin, const los_base* los); void random_uselessness(int scroll_slot = -1); int recharge_wand(const int item_slot = -1, bool known = true, - std::string *pre_msg = NULL); + string *pre_msg = NULL); void direct_effect(monster* src, spell_type spl, bolt &pbolt, actor *defender); |