summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/hints.h
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/hints.h
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-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/hints.h')
-rw-r--r--crawl-ref/source/hints.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/hints.h b/crawl-ref/source/hints.h
index 2bdfb48b8f..44db8bcce4 100644
--- a/crawl-ref/source/hints.h
+++ b/crawl-ref/source/hints.h
@@ -164,14 +164,14 @@ void hints_first_item(const item_def& item);
void learned_something_new(hints_event_type seen_what,
coord_def gc = coord_def());
formatted_string hints_abilities_info(void);
-std::string hints_skills_info(void);
-std::string hints_skill_training_info();
-std::string hints_skills_description_info(void);
+string hints_skills_info(void);
+string hints_skill_training_info();
+string hints_skills_description_info(void);
// Additional information for tutorial players.
void check_item_hint(const item_def &item, unsigned int num_old_talents);
void hints_describe_item(const item_def &item);
-void hints_inscription_info(bool autoinscribe, std::string prompt);
+void hints_inscription_info(bool autoinscribe, string prompt);
bool hints_pos_interesting(int x, int y);
void hints_describe_pos(int x, int y);
bool hints_monster_interesting(const monster* mons);