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/itemprop.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/itemprop.h')
| -rw-r--r-- | crawl-ref/source/itemprop.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 127f44cf68..5571f59445 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -114,7 +114,7 @@ skill_type weapon_skill(object_class_type wclass, int wtype); skill_type range_skill(const item_def &item); skill_type range_skill(object_class_type wclass, int wtype); -bool item_skills(const item_def &item, std::set<skill_type> &skills); +bool item_skills(const item_def &item, set<skill_type> &skills); void maybe_change_train(const item_def &item, bool start); // launcher and ammo functions: @@ -178,9 +178,9 @@ int item_mass(const item_def &item); equipment_type get_item_slot(object_class_type type, int sub_type); equipment_type get_item_slot(const item_def& item); -std::string item_base_name(const item_def &item); -std::string item_base_name(object_class_type type, int sub_type); -std::string food_type_name(int sub_type); +string item_base_name(const item_def &item); +string item_base_name(object_class_type type, int sub_type); +string food_type_name(int sub_type); const char* weapon_base_name(uint8_t subtype); void seen_item(const item_def &item); |