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/ng-wanderer.cc | |
| 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/ng-wanderer.cc')
| -rw-r--r-- | crawl-ref/source/ng-wanderer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc index e23d2fc020..c066d0c79b 100644 --- a/crawl-ref/source/ng-wanderer.cc +++ b/crawl-ref/source/ng-wanderer.cc @@ -664,7 +664,7 @@ static void _give_wanderer_spell(skill_type skill) } static void _wanderer_decent_equipment(skill_type & skill, - std::set<skill_type> & gift_skills, + set<skill_type> & gift_skills, int & slot) { const skill_type combined_weapon_skills[] = @@ -906,7 +906,7 @@ void create_wanderer(void) // Keep track of what skills we got items from, mostly to prevent // giving a good and then a normal version of the same weapon. - std::set<skill_type> gift_skills; + set<skill_type> gift_skills; // Wanderers get 1 good thing, a couple average things, and then // 1 last stage to fill any glaring equipment holes (no clothes, |