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/artefact.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/artefact.h')
| -rw-r--r-- | crawl-ref/source/artefact.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/artefact.h b/crawl-ref/source/artefact.h index d9d8296ce5..8846cdc509 100644 --- a/crawl-ref/source/artefact.h +++ b/crawl-ref/source/artefact.h @@ -69,7 +69,7 @@ struct unrandart_entry void (*melee_effects)(item_def* item, actor* attacker, actor* defender, bool mondied, int damage); setup_missile_type (*launch)(item_def* item, bolt* beam, - std::string* ammo_name, bool* returning); + string* ammo_name, bool* returning); } fight_func; bool (*evoke_func)(item_def *item, int* pract, bool* did_work, bool* unevokable); @@ -89,12 +89,12 @@ unique_item_status_type get_unique_item_status(int unrand_index); void set_unique_item_status(const item_def& item, unique_item_status_type status); -std::string get_artefact_name(const item_def &item, bool force_known = false); +string get_artefact_name(const item_def &item, bool force_known = false); -void set_artefact_name(item_def &item, const std::string &name); +void set_artefact_name(item_def &item, const string &name); -std::string make_artefact_name(const item_def &item, bool appearance = false); -std::string replace_name_parts(const std::string &name_in, const item_def& item); +string make_artefact_name(const item_def &item, bool appearance = false); +string replace_name_parts(const string &name_in, const item_def& item); int find_okay_unrandart(uint8_t aclass, uint8_t atype = OBJ_RANDOM, bool in_abyss = false); |