Revert "Fix short 180 degree rotation when using set_bone_position (#10405)" (#10534)

[minetest.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index b9ab7c066cf750f3099f9a1278ba4dceed6befba..ef7eddb39ebd57f139dabe02c0f08f4c3c9821c6 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -62,8 +62,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        Map
 */
 
-Map::Map(std::ostream &dout, IGameDef *gamedef):
-       m_dout(dout),
+Map::Map(IGameDef *gamedef):
        m_gamedef(gamedef),
        m_nodedef(gamedef->ndef())
 {
@@ -1201,7 +1200,7 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
 */
 ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
                EmergeManager *emerge, MetricsBackend *mb):
-       Map(dout_server, gamedef),
+       Map(gamedef),
        settings_mgr(g_settings, savedir + DIR_DELIM + "map_meta.txt"),
        m_emerge(emerge)
 {
@@ -1327,11 +1326,6 @@ u64 ServerMap::getSeed()
        return getMapgenParams()->seed;
 }
 
-s16 ServerMap::getWaterLevel()
-{
-       return getMapgenParams()->water_level;
-}
-
 bool ServerMap::blockpos_over_mapgen_limit(v3s16 p)
 {
        const s16 mapgen_limit_bp = rangelim(
@@ -1732,59 +1726,6 @@ void ServerMap::updateVManip(v3s16 pos)
        vm->m_is_dirty = true;
 }
 
-s16 ServerMap::findGroundLevel(v2s16 p2d)
-{
-#if 0
-       /*
-               Uh, just do something random...
-       */
-       // Find existing map from top to down
-       s16 max=63;
-       s16 min=-64;
-       v3s16 p(p2d.X, max, p2d.Y);
-       for(; p.Y>min; p.Y--)
-       {
-               MapNode n = getNodeNoEx(p);
-               if(n.getContent() != CONTENT_IGNORE)
-                       break;
-       }
-       if(p.Y == min)
-               goto plan_b;
-       // If this node is not air, go to plan b
-       if(getNodeNoEx(p).getContent() != CONTENT_AIR)
-               goto plan_b;
-       // Search existing walkable and return it
-       for(; p.Y>min; p.Y--)
-       {
-               MapNode n = getNodeNoEx(p);
-               if(content_walkable(n.d) && n.getContent() != CONTENT_IGNORE)
-                       return p.Y;
-       }
-
-       // Move to plan b
-plan_b:
-#endif
-
-       /*
-               Determine from map generator noise functions
-       */
-
-       s16 level = m_emerge->getGroundLevelAtPoint(p2d);
-       return level;
-
-       //double level = base_rock_level_2d(m_seed, p2d) + AVERAGE_MUD_AMOUNT;
-       //return (s16)level;
-}
-
-void ServerMap::createDirs(const std::string &path)
-{
-       if (!fs::CreateAllDirs(path)) {
-               m_dout<<"ServerMap: Failed to create directory "
-                               <<"\""<<path<<"\""<<std::endl;
-               throw BaseException("ServerMap failed to create directory");
-       }
-}
-
 void ServerMap::save(ModifiedState save_level)
 {
        if (!m_map_saving_enabled) {