summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/branch.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-12 09:03:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-12 09:03:37 +0000
commit14f96d4f59e4c91915bb15d2f4ca845e6e2e459e (patch)
tree0d4e442574394649b916aaecef060cda9a6c4282 /crawl-ref/source/branch.cc
parent42d4567bed5358f70d8205f17f65c380e6ad65f7 (diff)
downloadcrawl-ref-14f96d4f59e4c91915bb15d2f4ca845e6e2e459e.tar.gz
crawl-ref-14f96d4f59e4c91915bb15d2f4ca845e6e2e459e.zip
Remove unneeded methods (including the old resistance screen), rename
debugging functions, and some other clean-up. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5757 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/branch.cc')
-rw-r--r--crawl-ref/source/branch.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index 87ed88e193..9fd09b3e7e 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -28,10 +28,9 @@ bool at_branch_bottom()
branch_type str_to_branch(const std::string &branch, branch_type err)
{
for (int i = 0; i < NUM_BRANCHES; ++i)
- {
if (branches[i].abbrevname && branches[i].abbrevname == branch)
return (static_cast<branch_type>(i));
- }
+
return (err);
}