diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-08-31 00:44:20 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-08-31 00:44:20 +0200 |
| commit | a9eeb4a370e85069c25286e5cedc9682d5d04b2e (patch) | |
| tree | 450c0ccd5f5353553d5b96edee2850623dffcc03 /crawl-ref/source/ng-wanderer.cc | |
| parent | 57aec7d2a0ae1095fb1babd8f0fcc276927bf8e5 (diff) | |
| parent | 35613e094ca5d0be028ee9261afebf3e35faa563 (diff) | |
| download | crawl-ref-a9eeb4a370e85069c25286e5cedc9682d5d04b2e.tar.gz crawl-ref-a9eeb4a370e85069c25286e5cedc9682d5d04b2e.zip | |
Merge branch 'master' into glasnost
Yay for conflicts galore (wax removal, std:: purge, tileidx changes).
Diffstat (limited to 'crawl-ref/source/ng-wanderer.cc')
| -rw-r--r-- | crawl-ref/source/ng-wanderer.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc index c7bd0e630c..854fbb5fd5 100644 --- a/crawl-ref/source/ng-wanderer.cc +++ b/crawl-ref/source/ng-wanderer.cc @@ -336,7 +336,7 @@ static void _give_wanderer_book(skill_type skill, int & slot) break; case SK_TRANSMUTATIONS: - switch (random2(3)) + switch (random2(2)) { case 0: book_type = BOOK_GEOMANCY; @@ -344,9 +344,6 @@ static void _give_wanderer_book(skill_type skill, int & slot) case 1: book_type = BOOK_CHANGES; break; - case 2: - book_type = BOOK_STALKING; - break; } break; @@ -667,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[] = @@ -909,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, |