LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 41a1a246bfb7d771f85dfee06aec8f5f4bd1e02a..c3a1c1897dbc35d5594b140b888678c7aa12006b 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -32,7 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "voxel.h"
 #include "modifiedstate.h"
 #include "util/container.h"
-#include "util/cpp11_container.h"
 #include "nodetimer.h"
 #include "map_settings_manager.h"
 
@@ -73,17 +72,13 @@ enum MapEditEventType{
 
 struct MapEditEvent
 {
-       MapEditEventType type;
+       MapEditEventType type = MEET_OTHER;
        v3s16 p;
-       MapNode n;
+       MapNode n = CONTENT_AIR;
        std::set<v3s16> modified_blocks;
-       u16 already_known_by_peer;
+       u16 already_known_by_peer = 0;
 
-       MapEditEvent():
-               type(MEET_OTHER),
-               n(CONTENT_AIR),
-               already_known_by_peer(0)
-       { }
+       MapEditEvent() {}
 
        MapEditEvent * clone()
        {
@@ -143,11 +138,7 @@ public:
 
        Map(std::ostream &dout, IGameDef *gamedef);
        virtual ~Map();
-
-       /*virtual u16 nodeContainerId() const
-       {
-               return NODECONTAINER_ID_MAP;
-       }*/
+       DISABLE_CLASS_COPY(Map);
 
        virtual s32 mapType() const
        {
@@ -225,15 +216,6 @@ public:
        bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true);
        bool removeNodeWithEvent(v3s16 p);
 
-       /*
-               Takes the blocks at the edges into account
-       */
-       bool getDayNightDiff(v3s16 blockpos);
-
-       //core::aabbox3d<s16> getDisplayedBlockArea();
-
-       //bool updateChangedVisibleArea();
-
        // Call these before and after saving of many blocks
        virtual void beginSave() { return; }
        virtual void endSave() { return; }
@@ -328,7 +310,7 @@ protected:
        std::map<v2s16, MapSector*> m_sectors;
 
        // Be sure to set this to NULL when the cached sector is deleted
-       MapSector *m_sector_cache;
+       MapSector *m_sector_cache = nullptr;
        v2s16 m_sector_cache_p;
 
        // Queued transforming water nodes
@@ -341,12 +323,10 @@ protected:
                        float start_off, float end_off, u32 needed_count);
 
 private:
-       f32 m_transforming_liquid_loop_count_multiplier;
-       u32 m_unprocessed_count;
-       u64 m_inc_trending_up_start_time; // milliseconds
-       bool m_queue_size_timer_started;
-
-       DISABLE_CLASS_COPY(Map);
+       f32 m_transforming_liquid_loop_count_multiplier = 1.0f;
+       u32 m_unprocessed_count = 0;
+       u64 m_inc_trending_up_start_time = 0; // milliseconds
+       bool m_queue_size_timer_started = false;
 };
 
 /*
@@ -377,6 +357,8 @@ public:
        */
        ServerMapSector *createSector(v2s16 p);
 
+       bool saoPositionOverLimit(const v3f &p);
+
        /*
                Blocks are generated by using these and makeBlock().
        */
@@ -409,9 +391,6 @@ public:
        */
        MapBlock *getBlockOrEmerge(v3s16 p3d);
 
-       // Carries out any initialization necessary before block is sent
-       void prepareBlock(MapBlock *block);
-
        // Helper for placing objects on ground level
        s16 findGroundLevel(v2s16 p2d);
 
@@ -509,8 +488,8 @@ private:
                Metadata is re-written on disk only if this is true.
                This is reset to false when written on disk.
        */
-       bool m_map_metadata_changed;
-       MapDatabase *dbase;
+       bool m_map_metadata_changed = true;
+       MapDatabase *dbase = nullptr;
 };
 
 
@@ -529,9 +508,6 @@ public:
                m_loaded_blocks.clear();
        }
 
-       void setMap(Map *map)
-       {m_map = map;}
-
        void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
                bool load_if_inexistent = true);
 
@@ -539,10 +515,9 @@ public:
        void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks,
                bool overwrite_generated = true);
 
-       bool m_is_dirty;
+       bool m_is_dirty = false;
 
 protected:
-       bool m_create_area;
        Map *m_map;
        /*
                key = blockpos