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/godpassive.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/godpassive.h')
| -rw-r--r-- | crawl-ref/source/godpassive.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/godpassive.h b/crawl-ref/source/godpassive.h index 62702b5b78..fbec6d5224 100644 --- a/crawl-ref/source/godpassive.h +++ b/crawl-ref/source/godpassive.h @@ -23,12 +23,12 @@ void jiyva_slurp_bonus(int item_value, int *js); void jiyva_slurp_message(int js); void ash_init_bondage(player *y); void ash_check_bondage(bool msg = true); -std::string ash_describe_bondage(int flags, bool level); +string ash_describe_bondage(int flags, bool level); bool god_id_item(item_def& item, bool silent = true); void ash_id_monster_equipment(monster* mon); int ash_detect_portals(bool all); monster_type ash_monster_tier(const monster *mon); int ash_skill_boost(skill_type sk, int scale); -std::map<skill_type, int8_t> ash_get_boosted_skills(eq_type type); +map<skill_type, int8_t> ash_get_boosted_skills(eq_type type); #endif |