summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-17 07:37:27 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-17 07:37:27 +0000
commit1210d4439b7da2cea42e15892f7a09a03c6f0814 (patch)
tree8d1b24e2c887803607fa028ba950fd5da5cbd7b4 /crawl-ref/source/travel.cc
parentd05ad02e6ca609c768a843eb62beda9f602e821a (diff)
downloadcrawl-ref-1210d4439b7da2cea42e15892f7a09a03c6f0814.tar.gz
crawl-ref-1210d4439b7da2cea42e15892f7a09a03c6f0814.zip
Apply DOS fixes to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6580 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/travel.cc')
-rw-r--r--crawl-ref/source/travel.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 39674e8660..b95cd72dc1 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -2238,7 +2238,7 @@ static travel_target _parse_travel_target( std::string s, travel_target &targ )
std::string::size_type epos = s.find(ekey);
if (!s.empty())
- targ.entrance_only = epos != std::string::npos;
+ targ.entrance_only = (epos != std::string::npos);
if (targ.entrance_only && !s.empty())
s = trimmed_string(s.substr(0, epos) + s.substr(epos + ekey.length()));
@@ -2255,8 +2255,7 @@ static travel_target _parse_travel_target( std::string s, travel_target &targ )
return (targ);
}
-static void _travel_depth_munge(int munge_method,
- const std::string &s,
+static void _travel_depth_munge(int munge_method, const std::string &s,
travel_target &targ)
{
_parse_travel_target(s, targ);