Translated using Weblate (Japanese)

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

diff --git a/src/client.h b/src/client.h
index 547edfeabe48d308617ab1fe54888a1833fb411e..5b57aa52a6e345a9ead4456086e13e4e2fab4b55 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "network/connection.h"
 #include "environment.h"
 #include "irrlichttypes_extrabloated.h"
-#include "jthread/jmutex.h"
+#include "threading/mutex.h"
 #include <ostream>
 #include <map>
 #include <set>
@@ -89,14 +89,14 @@ public:
 
        u32 size()
        {
-               JMutexAutoLock lock(m_mutex);
+               MutexAutoLock lock(m_mutex);
                return m_queue.size();
        }
 
 private:
        std::vector<QueuedMeshUpdate*> m_queue;
        std::set<v3s16> m_urgents;
-       JMutex m_mutex;
+       Mutex m_mutex;
 };
 
 struct MeshUpdateResult
@@ -119,19 +119,14 @@ private:
        MeshUpdateQueue m_queue_in;
 
 protected:
-       const char *getName()
-       { return "MeshUpdateThread"; }
        virtual void doUpdate();
 
 public:
 
-       MeshUpdateThread()
-       {
-       }
+       MeshUpdateThread() : UpdateThread("Mesh") {}
 
        void enqueueUpdate(v3s16 p, MeshMakeData *data,
                        bool ack_block_to_server, bool urgent);
-
        MutexedQueue<MeshUpdateResult> m_queue_out;
 
        v3s16 m_camera_offset;
@@ -515,6 +510,9 @@ public:
        Mapper* getMapper ()
        { return m_mapper; }
 
+       bool isMinimapDisabledByServer()
+       { return m_minimap_disabled_by_server; }
+
        // IGameDef interface
        virtual IItemDefManager* getItemDefManager();
        virtual INodeDefManager* getNodeDefManager();
@@ -595,6 +593,7 @@ private:
        con::Connection m_con;
        IrrlichtDevice *m_device;
        Mapper *m_mapper;
+       bool m_minimap_disabled_by_server;
        // Server serialization version
        u8 m_server_ser_ver;