diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 17:18:19 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 17:18:19 +0100 |
| commit | 2d0488338ac2a0388167c9e8b73766ae8af1e8d4 (patch) | |
| tree | c92aa786daa5e2f0782de9234d70fcb0fdfaf700 /crawl-ref/source/branch.h | |
| parent | 177cfa8d1158dd7c2ed8c995cf1ee706f1492f80 (diff) | |
| parent | 59910180e554e796fe4a8b1f095f88dccbe0ac89 (diff) | |
| download | crawl-ref-2d0488338ac2a0388167c9e8b73766ae8af1e8d4.tar.gz crawl-ref-2d0488338ac2a0388167c9e8b73766ae8af1e8d4.zip | |
Merge branch 'master' into mon-pick
Merge commits instead of rerere suck, but not being able to comfortably use
the test rig sucks even more.
Diffstat (limited to 'crawl-ref/source/branch.h')
| -rw-r--r-- | crawl-ref/source/branch.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h index 04c2e9dbab..1817de46ba 100644 --- a/crawl-ref/source/branch.h +++ b/crawl-ref/source/branch.h @@ -57,8 +57,7 @@ bool is_connected_branch(branch_type branch); bool is_connected_branch(level_id place); level_id current_level_parent(); -branch_type str_to_branch(const std::string &branch, - branch_type err = NUM_BRANCHES); +branch_type str_to_branch(const string &branch, branch_type err = NUM_BRANCHES); int current_level_ambient_noise(); |