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/itemname.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/itemname.h')
-rw-r--r-- | crawl-ref/source/itemname.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h index 97f1256dfe..f52507a3a3 100644 --- a/crawl-ref/source/itemname.h +++ b/crawl-ref/source/itemname.h @@ -88,8 +88,8 @@ const char* racial_description_string(const item_def& item, bool terse = false); void check_item_knowledge(bool unknown_items = false); void display_runes(); -std::string quant_name(const item_def &item, int quant, - description_level_type des, bool terse = false); +string quant_name(const item_def &item, int quant, + description_level_type des, bool terse = false); bool item_type_known(const item_def &item); bool item_type_unknown(const item_def &item); @@ -103,8 +103,7 @@ bool is_bad_item(const item_def &item, bool temp = false); bool is_dangerous_item(const item_def& item, bool temp = false); bool is_useless_item(const item_def &item, bool temp = false); -std::string make_name(uint32_t seed, bool all_caps, int maxlen = -1, - char start = 0); +string make_name(uint32_t seed, bool all_caps, int maxlen = -1, char start = 0); const char* weapon_brand_name(const item_def& item, bool terse); const char* armour_ego_name(const item_def& item, bool terse); @@ -120,25 +119,24 @@ void set_ident_type(item_def &item, item_type_id_state_type setting, void set_ident_type(object_class_type basetype, int subtype, item_type_id_state_type setting, bool force = false); -std::string menu_colour_item_prefix(const item_def &item, bool temp = true); -std::string filtering_item_prefix(const item_def &item, bool temp = true); -std::string get_menu_colour_prefix_tags(const item_def &item, - description_level_type desc); +string menu_colour_item_prefix(const item_def &item, bool temp = true); +string filtering_item_prefix(const item_def &item, bool temp = true); +string get_menu_colour_prefix_tags(const item_def &item, + description_level_type desc); void init_item_name_cache(); -item_kind item_kind_by_name(std::string name); +item_kind item_kind_by_name(string name); -std::vector<std::string> item_name_list_for_glyph(unsigned glyph); +vector<string> item_name_list_for_glyph(unsigned glyph); const char* rune_type_name(int p); -bool is_named_corpse(const item_def &corpse); -std::string get_corpse_name(const item_def &corpse, - uint64_t *name_type = NULL); -std::string base_type_string(object_class_type type, bool known = true); -std::string base_type_string(const item_def &item, bool known = true); +bool is_named_corpse(const item_def &corpse); +string get_corpse_name(const item_def &corpse, uint64_t *name_type = NULL); +string base_type_string(object_class_type type, bool known = true); +string base_type_string(const item_def &item, bool known = true); -std::string sub_type_string(const item_def &item, bool known = true); +string sub_type_string(const item_def &item, bool known = true); -std::string ego_type_string(const item_def &item); +string ego_type_string(const item_def &item); #endif |