Implement GItlab CI daily builds for windows platform (32 & 64) (#5923)

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 7e597bef6cb3d690eaf03ecb7186e6fd7e872aca..0be0e96a37c63ba7e18f958e49962a8a5f3c778d 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"
 
@@ -343,7 +342,7 @@ class Map /*: public NodeContainer*/
 private:
        f32 m_transforming_liquid_loop_count_multiplier;
        u32 m_unprocessed_count;
-       u32 m_inc_trending_up_start_time; // milliseconds
+       u64 m_inc_trending_up_start_time; // milliseconds
        bool m_queue_size_timer_started;
 
        DISABLE_CLASS_COPY(Map);
@@ -377,6 +376,8 @@ class ServerMap : public Map
        */
        ServerMapSector *createSector(v2s16 p);
 
+       bool saoPositionOverLimit(const v3f &p);
+
        /*
                Blocks are generated by using these and makeBlock().
        */
@@ -409,9 +410,6 @@ class ServerMap : public Map
        */
        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);