Refactor map extra and related functions

Author: sparr

src/action.cpp

@@ -37,7 +37,6 @@
 #include "point.h"
 #include "popup.h"
 #include "ret_val.h"
-#include "string_formatter.h"
 #include "translations.h"
 #include "type_id.h"
 #include "uilist.h"

src/animation.cpp

@@ -31,7 +31,6 @@
 #include "output.h"
 #include "point.h"
 #include "popup.h"
-#include "string_formatter.h"
 #include "translations.h"
 #include "type_id.h"
 #include "ui_manager.h"

src/avatar_action.cpp

@@ -56,7 +56,6 @@
 #include "ranged.h"
 #include "ret_val.h"
 #include "rng.h"
-#include "string_formatter.h"
 #include "translations.h"
 #include "type_id.h"
 #include "ui_manager.h"

src/character.cpp

@@ -10618,7 +10618,7 @@ void Character::place_corpse( const tripoint_abs_omt &om_target )
     bay.load( om_target, false );
     // Redundant as long as map operations aren't using get_map() in a transitive call chain. Added for future proofing.
     swap_map swap( *bay.cast_to_map() );
-    point_omt_ms fin( rng( 1, SEEX * 2 - 2 ), rng( 1, SEEX * 2 - 2 ) );
+    point_omt_ms fin = rng_map_point<point_omt_ms>( 1 );
     // This makes no sense at all. It may find a random tile without furniture, but
     // if the first try to find one fails, it will go through all tiles of the map
     // and essentially select the last one that has no furniture.

src/coordinates.h

@@ -265,6 +265,10 @@ class coord_point_ob : public
             return coord_point_ob( this->raw().rotate( turns, dim ) );
         }
 
+        constexpr auto rotate_in_map( int turns ) const {
+            return coord_point_ob( this->raw().rotate_in_map( turns ) );
+        }
+
         friend inline this_as_ob operator+( const coord_point_ob &l, const point &r ) {
             return this_as_ob( l.raw() + r );
         }

src/map_extras.cpp

@@ -76,6 +76,12 @@ std::optional<tripoint_bub_ms> random_point( const tripoint_range<tripoint_bub_m
     return random_entry( suitable );
 }
 
+int rng_map_coord( int border )
+{
+    // this assumes SEEY==SEEX
+    return rng( border, SEEX * 2 - 1 - border );
+}
+
 map_cursor::map_cursor( const tripoint_bub_ms &pos ) : pos_abs_( g ? get_map().get_abs(
                 pos ) : tripoint_abs_ms::zero ), pos_bub_( g ? tripoint_bub_ms::zero : pos ) { }
 

src/map_selector.cpp

@@ -6689,7 +6689,7 @@ void map::draw_lab( mapgendata &dat )
                                 ter_set( p, fluid_type );
                                 furn_set( p, furn_str_id::NULL_ID() );
                             }
-                        }, point_bub_ms( rng( 1, SEEX * 2 - 2 ), rng( 1, SEEY * 2 - 2 ) ), rng( 3, 6 ) );
+                        }, rng_map_point<point_bub_ms>( 1 ), rng( 3, 6 ) );
                     }
                     break;
                 }
@@ -6765,7 +6765,7 @@ void map::draw_lab( mapgendata &dat )
                             }
                         }
                     }
-                    tripoint_bub_ms center( rng( 6, SEEX * 2 - 7 ), rng( 6, SEEY * 2 - 7 ), abs_sub.z() );
+                    tripoint_bub_ms center = rng_map_point<tripoint_bub_ms>( 6, abs_sub.z() );
 
                     // Make a portal surrounded by more dense fungal stuff and a fungaloid.
                     draw_rough_circle( [this]( const point_bub_ms & p ) {

src/mapgen.cpp

@@ -18,11 +18,11 @@
 #include "coordinates.h"
 #include "creature_tracker.h"
 #include "cuboid_rectangle.h"
-#include "debug.h"
 #include "flood_fill.h"
 #include "map.h"
 #include "map_iterator.h"
 #include "map_scale_constants.h"
+#include "mapdata.h"
 #include "mapgen.h"
 #include "mapgendata.h"
 #include "mapgenformat.h"
@@ -74,38 +74,6 @@ static const ter_str_id ter_t_water_sh( "t_water_sh" );
 
 static const vspawn_id VehicleSpawn_default_subway_deadend( "default_subway_deadend" );
 
-tripoint_bub_ms rotate_point( const tripoint_bub_ms &p, int rotations )
-{
-    if( p.x() < 0 || p.x() >= SEEX * 2 ||
-        p.y() < 0 || p.y() >= SEEY * 2 ) {
-        debugmsg( "Point out of range: %d,%d,%d", p.x(), p.y(), p.z() );
-        // Mapgen is vulnerable, don't supply invalid points, debugmsg is enough
-        return tripoint_bub_ms( 0, 0, p.z() );
-    }
-
-    rotations = rotations % 4;
-
-    tripoint_bub_ms ret = p;
-    switch( rotations ) {
-        case 0:
-            break;
-        case 1:
-            ret.x() = p.y();
-            ret.y() = SEEX * 2 - 1 - p.x();
-            break;
-        case 2:
-            ret.x() = SEEX * 2 - 1 - p.x();
-            ret.y() = SEEY * 2 - 1 - p.y();
-            break;
-        case 3:
-            ret.x() = SEEY * 2 - 1 - p.y();
-            ret.y() = p.x();
-            break;
-    }
-
-    return ret;
-}
-
 building_gen_pointer get_mapgen_cfunction( const std::string &ident )
 {
     static const std::map<std::string, building_gen_pointer> pointers = { {

src/mapgen_functions.cpp

@@ -22,12 +22,6 @@ struct mapgen_parameters;
 using mapgen_update_func = std::function<void( const tripoint_abs_omt &map_pos3, mission *miss )>;
 class JsonObject;
 
-/**
- * Calculates the coordinates of a rotated point.
- * Should match the `mapgen_*` rotation.
- */
-tripoint_bub_ms rotate_point( const tripoint_bub_ms &p, int rotations );
-
 int terrain_type_to_nesw_array( oter_id terrain_type, std::array<bool, 4> &array );
 
 using building_gen_pointer = void ( * )( mapgendata & );