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/mutation.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/mutation.h')
| -rw-r--r-- | crawl-ref/source/mutation.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crawl-ref/source/mutation.h b/crawl-ref/source/mutation.h index e0a1827f3b..34e1e9b53b 100644 --- a/crawl-ref/source/mutation.h +++ b/crawl-ref/source/mutation.h @@ -69,15 +69,14 @@ const mutation_def& get_mutation_def(mutation_type mut); void fixup_mutations(); -bool mutate(mutation_type which_mutation, const std::string &reason, +bool mutate(mutation_type which_mutation, const string &reason, bool failMsg = true, bool force_mutation = false, bool god_gift = false, bool stat_gain_potion = false, bool demonspawn = false, bool no_rot = false); -static inline bool give_bad_mutation(const std::string &reason, - bool failMsg = true, - bool force_mutation = false) +static inline bool give_bad_mutation(const string &reason, bool failMsg = true, + bool force_mutation = false) { return mutate(RANDOM_BAD_MUTATION, reason, failMsg, force_mutation, false, false, false); @@ -85,21 +84,21 @@ static inline bool give_bad_mutation(const std::string &reason, void display_mutations(); mutation_activity_type mutation_activity_level(mutation_type mut); -std::string describe_mutations(bool center_title); +string describe_mutations(bool center_title); -bool delete_mutation(mutation_type which_mutation, const std::string &reason, +bool delete_mutation(mutation_type which_mutation, const string &reason, bool failMsg = true, bool force_mutation = false, bool god_gift = false, bool disallow_mismatch = false); -bool delete_all_mutations(const std::string &reason); +bool delete_all_mutations(const string &reason); -std::string mutation_name(mutation_type which_mutat, int level = -1, +string mutation_name(mutation_type which_mutat, int level = -1, bool colour = false); void roll_demonspawn_mutations(); -bool perma_mutate(mutation_type which_mut, int how_much, const std::string &reason); +bool perma_mutate(mutation_type which_mut, int how_much, const string &reason); int how_mutated(bool all = false, bool levels = false); void check_demonic_guardian(); |