Apply some more commits to bring 0.4 up to date.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6484 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 4 deletions

diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 6326b38708..e8fbe6dc2b 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -1983,7 +1983,7 @@ static bool _is_known_branch_id(int branch)
         return (true);
 
     // The Vestibule is special: there are no stairs to it, just a
-    // portal
+    // portal.
     if (branch == BRANCH_VESTIBULE_OF_HELL)
         return overmap_knows_portal(DNGN_ENTER_HELL);
 
@@ -3430,13 +3430,16 @@ void LevelInfo::fixup()
 bool TravelCache::know_stair(const coord_def &c) const
 {
     travel_levels_map::const_iterator i = levels.find(level_id::current());
-    return (i == levels.end()? false : i->second.know_stair(c));
+    return (i == levels.end() ? false : i->second.know_stair(c));
 }
 
 void TravelCache::travel_to_waypoint(int num)
 {
-    if (num < 0 || num >= TRAVEL_WAYPOINT_COUNT) return;
-    if (waypoints[num].id.depth == -1) return;
+    if (num < 0 || num >= TRAVEL_WAYPOINT_COUNT)
+        return;
+
+    if (waypoints[num].id.depth == -1)
+        return;
 
     start_translevel_travel(waypoints[num]);
 }