From 07c971131b6fced3348f0c09e1479f223eb26274 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 22:16:06 +0000 Subject: [PATCH] style(autofix.ci): automated formatting --- data/json/test_regions.json | 2 +- src/overmap.cpp | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/data/json/test_regions.json b/data/json/test_regions.json index 5a183a509bb9..c7db757d2c40 100644 --- a/data/json/test_regions.json +++ b/data/json/test_regions.json @@ -126,7 +126,7 @@ "police": 1, "s_lot": 6 }, - "finales": {"Military Outpost": 200 } + "finales": { "Military Outpost": 200 } }, "weather": { "spring_temp": 16, diff --git a/src/overmap.cpp b/src/overmap.cpp index d16c69a98269..46168a353ea2 100644 --- a/src/overmap.cpp +++ b/src/overmap.cpp @@ -4783,11 +4783,11 @@ bool overmap::place_building( const tripoint_om_omt &p, om_direction::type dir, if( can_place_special( *building_tid, building_pos, building_dir, false ) ) { place_special( *building_tid, building_pos, building_dir, town, false, false ); - return(true); + return( true ); break; } } - return(false); + return( false ); } //city passed by reference as it's modified by the function, which calls itself recursively void overmap::build_city_street( @@ -4859,12 +4859,9 @@ void overmap::build_city_street( if( attempt_finale_place && !town.finale_placed ) { //attempt to place a finale, confirm that it was placed. - if ( place_building( rp, om_direction::turn_left( dir ), town, true ) ) - { + if( place_building( rp, om_direction::turn_left( dir ), town, true ) ) { town.finale_placed = true; - } - else // if the finale fails to place stop trying. This prevents the finale getting placed at the edge of town. - { + } else { // if the finale fails to place stop trying. This prevents the finale getting placed at the edge of town. attempt_finale_place = false; } } else { @@ -4875,12 +4872,9 @@ void overmap::build_city_street( if( attempt_finale_place && !town.finale_placed ) { //attempt to place a finale, confirm that it was placed. - if ( place_building( rp, om_direction::turn_left( dir ), town, true ) ) - { + if( place_building( rp, om_direction::turn_left( dir ), town, true ) ) { town.finale_placed = true; - } - else // if the finale fails to place stop trying. This prevents the finale getting placed at the edge of town. - { + } else { // if the finale fails to place stop trying. This prevents the finale getting placed at the edge of town. attempt_finale_place = false; } } else {