diff --git a/src/mapbuffer.cpp b/src/mapbuffer.cpp index ea277c7658897..4b74edd08076b 100644 --- a/src/mapbuffer.cpp +++ b/src/mapbuffer.cpp @@ -65,11 +65,6 @@ bool mapbuffer::add_submap( const tripoint &p, submap *sm ) return true; } -bool mapbuffer::add_submap( int x, int y, int z, submap *sm ) -{ - return add_submap( tripoint( x, y, z ), sm ); -} - bool mapbuffer::add_submap( const tripoint &p, std::unique_ptr &sm ) { const bool result = add_submap( p, sm.get() ); @@ -79,11 +74,6 @@ bool mapbuffer::add_submap( const tripoint &p, std::unique_ptr &sm ) return result; } -bool mapbuffer::add_submap( int x, int y, int z, std::unique_ptr &sm ) -{ - return add_submap( tripoint( x, y, z ), sm ); -} - void mapbuffer::remove_submap( tripoint addr ) { auto m_target = submaps.find( addr ); @@ -95,11 +85,6 @@ void mapbuffer::remove_submap( tripoint addr ) submaps.erase( m_target ); } -submap *mapbuffer::lookup_submap( int x, int y, int z ) -{ - return lookup_submap( tripoint( x, y, z ) ); -} - submap *mapbuffer::lookup_submap( const tripoint &p ) { dbg( D_INFO ) << "mapbuffer::lookup_submap( x[" << p.x << "], y[" << p.y << "], z[" << p.z << "])"; diff --git a/src/mapbuffer.h b/src/mapbuffer.h index 6f681abed8b9b..4ec9947aafdc4 100644 --- a/src/mapbuffer.h +++ b/src/mapbuffer.h @@ -41,9 +41,7 @@ class mapbuffer * is not stored than and the caller must take of the submap object * on their own (and properly delete it). */ - bool add_submap( int x, int y, int z, std::unique_ptr &sm ); bool add_submap( const tripoint &p, std::unique_ptr &sm ); - bool add_submap( int x, int y, int z, submap *sm ); bool add_submap( const tripoint &p, submap *sm ); /** Get a submap stored in this buffer. @@ -54,7 +52,6 @@ class mapbuffer * and could not be loaded. The mapbuffer takes care of the returned * submap object, don't delete it on your own. */ - submap *lookup_submap( int x, int y, int z ); submap *lookup_submap( const tripoint &p ); private: