Merge pull request #28811 from ZhilkinSerg/fix-astyle-2019-03-19

Fix astyle regression (2019-03-19)

src/output.cpp

@@ -1633,7 +1633,8 @@ std::string shortcut_text( nc_color shortcut_color, const std::string &fmt )
 }
 
 const std::pair<std::string, nc_color>
-get_bar( float cur, float max, int width, bool extra_resolution, const std::vector<nc_color> &colors )
+get_bar( float cur, float max, int width, bool extra_resolution,
+         const std::vector<nc_color> &colors )
 {
     std::string result;
     float status = cur / max;

src/overmap.cpp

@@ -2243,19 +2243,20 @@ void overmap::place_forest_trailheads()
     // 3. we're within trailhead_road_distance from an existing road
     // 4. rng rolls a success for our trailhead_chance from the configuration
 
-    const auto trailhead_close_to_road = [&]( const tripoint &trailhead ) {
+    const auto trailhead_close_to_road = [&]( const tripoint & trailhead ) {
         bool close = false;
-        for( const point &nearby_point : closest_points_first( settings.forest_trail.trailhead_road_distance,
-                point( trailhead.x, trailhead.y ) ) ) {
+        for( const point &nearby_point : closest_points_first(
+                 settings.forest_trail.trailhead_road_distance,
+                 point( trailhead.x, trailhead.y ) ) ) {
             if( check_ot_subtype( "road", nearby_point.x, nearby_point.y, 0 ) ) {
                 close = true;
             }
         }
         return close;
     };
 
-    const auto try_place_trailhead = [&]( const tripoint &trailhead, const tripoint &road,
-    const std::string &suffix ) {
+    const auto try_place_trailhead = [&]( const tripoint & trailhead, const tripoint & road,
+    const std::string & suffix ) {
         oter_id &oter_potential_trailhead = ter( trailhead );
         oter_id &oter_potential_road = ter( road );
         if( oter_potential_trailhead == "field" && oter_potential_road == "field" &&