Add '/clearobjects quick'

[minetest.git] / src / minimap.h

diff --git a/src/minimap.h b/src/minimap.h
index 628be7489e2af73c1a370155d7b23f50e6cddc6d..dd1397d54c18b4f19102eca204b810f55785c2cc 100644 (file)
--- a/src/minimap.h
+++ b/src/minimap.h
@@ -20,18 +20,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MINIMAP_HEADER
 #define MINIMAP_HEADER
 
-#include <map>
-#include <string>
-#include <vector>
 #include "irrlichttypes_extrabloated.h"
 #include "client.h"
 #include "voxel.h"
-#include "jthread/jmutex.h"
-#include "jthread/jsemaphore.h"
+#include "threading/mutex.h"
+#include "threading/semaphore.h"
+#include <map>
+#include <string>
+#include <vector>
 
 #define MINIMAP_MAX_SX 512
 #define MINIMAP_MAX_SY 512
 
+
 enum MinimapMode {
        MINIMAP_MODE_OFF,
        MINIMAP_MODE_SURFACEx1,
@@ -90,6 +91,7 @@ struct QueuedMinimapUpdate {
 
 class MinimapUpdateThread : public UpdateThread {
 public:
+       MinimapUpdateThread() : UpdateThread("Minimap") {}
        virtual ~MinimapUpdateThread();
 
        void getMap(v3s16 pos, s16 size, s16 height, bool radar);
@@ -105,11 +107,10 @@ class MinimapUpdateThread : public UpdateThread {
        MinimapData *data;
 
 protected:
-       const char *getName() { return "MinimapUpdateThread"; }
        virtual void doUpdate();
 
 private:
-       JMutex m_queue_mutex;
+       Mutex m_queue_mutex;
        std::deque<QueuedMinimapUpdate> m_update_queue;
        std::map<v3s16, MinimapMapblock *> m_blocks_cache;
 };
@@ -151,7 +152,7 @@ class Mapper {
        bool m_enable_shaders;
        u16 m_surface_mode_scan_height;
        f32 m_angle;
-       JMutex m_mutex;
+       Mutex m_mutex;
 };
 
 #endif