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/skills2.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/skills2.h')
| -rw-r--r-- | crawl-ref/source/skills2.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/skills2.h b/crawl-ref/source/skills2.h index 7a842ec06c..c6658cb1b2 100644 --- a/crawl-ref/source/skills2.h +++ b/crawl-ref/source/skills2.h @@ -37,19 +37,19 @@ int get_skill_progress(skill_type sk, int level, int points, int scale); int get_skill_progress(skill_type sk, int scale); int get_skill_percentage(const skill_type x); const char *skill_name(skill_type which_skill); -skill_type str_to_skill(const std::string &skill); +skill_type str_to_skill(const string &skill); -std::string skill_title( +string skill_title( skill_type best_skill, uint8_t skill_lev, // these used for ghosts and hiscores: int species = -1, int str = -1, int dex = -1, int god = -1); -std::string skill_title_by_rank( +string skill_title_by_rank( skill_type best_skill, uint8_t skill_rank, // these used for ghosts and hiscores: int species = -1, int str = -1, int dex = -1, int god = -1); unsigned get_skill_rank(unsigned skill_lev); -std::string player_title(); +string player_title(); skill_type best_skill(skill_type min_skill, skill_type max_skill, skill_type excl_skill = SK_NONE); @@ -71,7 +71,7 @@ bool is_antitrained(skill_type sk); bool antitrain_other(skill_type sk, bool show_zero); void skill_menu(int flag = 0, int exp = 0); -void dump_skills(std::string &text); +void dump_skills(string &text); int skill_transfer_amount(skill_type sk); int transfer_skill_points(skill_type fsk, skill_type tsk, int skp_max, bool simu, bool boost = false); |