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/mon-place.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/mon-place.h')
| -rw-r--r-- | crawl-ref/source/mon-place.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-place.h b/crawl-ref/source/mon-place.h index d4fc3bd7b9..e06e57120f 100644 --- a/crawl-ref/source/mon-place.h +++ b/crawl-ref/source/mon-place.h @@ -110,7 +110,7 @@ bool can_spawn_mushrooms(coord_def where); void spawn_random_monsters(); -void set_vault_mon_list(const std::vector<mons_spec> &list); +void set_vault_mon_list(const vector<mons_spec> &list); void setup_vault_mon_list(); @@ -118,7 +118,7 @@ monster* get_free_monster(); bool can_place_on_trap(monster_type mon_type, trap_type trap); bool mons_airborne(monster_type mcls, int flies, bool paralysed); -void mons_add_blame(monster* mon, const std::string &blame_string); +void mons_add_blame(monster* mon, const string &blame_string); // Active monster band may influence gear generation on band followers. extern band_type active_monster_band; |