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/spl-goditem.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/spl-goditem.h')
| -rw-r--r-- | crawl-ref/source/spl-goditem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-goditem.h b/crawl-ref/source/spl-goditem.h index d4334e2d99..a913ec7c1d 100644 --- a/crawl-ref/source/spl-goditem.h +++ b/crawl-ref/source/spl-goditem.h @@ -1,7 +1,7 @@ #ifndef SPL_GODITEM_H #define SPL_GODITEM_H -int identify(int power, int item_slot = -1, std::string *pre_msg = NULL); +int identify(int power, int item_slot = -1, string *pre_msg = NULL); int cast_healing(int pow, int max_pow, bool divine_ability = false, const coord_def& where = coord_def(0, 0), bool not_self = false, targ_mode_type mode = TARG_NUM_MODES); @@ -11,8 +11,8 @@ void antimagic(); int detect_traps(int pow); int detect_items(int pow); int detect_creatures(int pow, bool telepathic = false); -bool remove_curse(bool alreadyknown = true, std::string *pre_msg = NULL); -bool curse_item(bool armour, bool alreadyknown, std::string *pre_msg = NULL); +bool remove_curse(bool alreadyknown = true, string *pre_msg = NULL); +bool curse_item(bool armour, bool alreadyknown, string *pre_msg = NULL); bool entomb(int pow); bool cast_imprison(int pow, monster* mons, int source); |