Switch F3 to use 'enable_fog' setting

[minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index cf0a27d638200ebdd55c08d075f879c777cf2f0b..e1f5d5ab04468119658977f145756b29780a9030 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -17,23 +17,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef EMERGE_HEADER
-#define EMERGE_HEADER
+#pragma once
 
 #include <map>
 #include <mutex>
+#include "network/networkprotocol.h"
 #include "irr_v3d.h"
 #include "util/container.h"
-#include "mapgen.h" // for MapgenParams
+#include "mapgen/mapgen.h" // for MapgenParams
 #include "map.h"
 
 #define BLOCK_EMERGE_ALLOW_GEN   (1 << 0)
 #define BLOCK_EMERGE_FORCE_QUEUE (1 << 1)
 
-#define EMERGE_DBG_OUT(x) do {                         \
+#define EMERGE_DBG_OUT(x) {                            \
        if (enable_mapgen_debug_info)                      \
                infostream << "EmergeThread: " x << std::endl; \
-} while (0)
+}
 
 class EmergeThread;
 class INodeDefManager;
@@ -55,7 +55,8 @@ struct BlockMakeData {
        UniqueQueue<v3s16> transforming_liquid;
        INodeDefManager *nodedef = nullptr;
 
-       BlockMakeData() {}
+       BlockMakeData() = default;
+
        ~BlockMakeData() { delete vmanip; }
 };
 
@@ -123,14 +124,14 @@ class EmergeManager {
        bool isRunning();
 
        bool enqueueBlockEmerge(
-               u16 peer_id,
+               session_t peer_id,
                v3s16 blockpos,
                bool allow_generate,
                bool ignore_queue_limits=false);
 
        bool enqueueBlockEmergeEx(
                v3s16 blockpos,
-               u16 peer_id,
+               session_t peer_id,
                u16 flags,
                EmergeCompletionCallback callback,
                void *callback_param);
@@ -174,5 +175,3 @@ class EmergeManager {
 
        friend class EmergeThread;
 };
-
-#endif