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/flood_find.h | |
| 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/flood_find.h')
| -rw-r--r-- | crawl-ref/source/flood_find.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/flood_find.h b/crawl-ref/source/flood_find.h index e88501c7de..d128afbcd5 100644 --- a/crawl-ref/source/flood_find.h +++ b/crawl-ref/source/flood_find.h @@ -30,7 +30,7 @@ protected: protected: bool point_hunt, want_exit, no_vault, check_traversable; bool needed_features[NUM_FEATURES]; - std::vector<coord_def> needed_points; + vector<coord_def> needed_points; bool left_vault; const map_mask *vaults; @@ -126,8 +126,8 @@ bool flood_find<fgrd, bound_check>::path_flood( if (!needed_points.empty()) { - std::vector<coord_def>::iterator i = - std::find(needed_points.begin(), needed_points.end(), dc); + vector<coord_def>::iterator i = find(needed_points.begin(), + needed_points.end(), dc); if (i != needed_points.end()) { needed_points.erase(i); |