Translated using Weblate (Japanese)

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

diff --git a/src/environment.h b/src/environment.h
index c7069431678983ed4294580e6c8d8e5e23bf5525..22840a9fcaba7a924c664d0c05779f76aed2d3e8 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "mapnode.h"
 #include "mapblock.h"
-#include "jthread/jmutex.h"
+#include "threading/mutex.h"
 #include "network/networkprotocol.h" // for AccessDeniedCode
 
 class ServerEnvironment;
@@ -127,8 +127,8 @@ protected:
        bool m_cache_enable_shaders;
 
 private:
-       JMutex m_timeofday_lock;
-       JMutex m_time_lock;
+       Mutex m_timeofday_lock;
+       Mutex m_time_lock;
 
 };
 
@@ -534,7 +534,7 @@ private:
        IrrlichtDevice *m_irr;
        std::map<u16, ClientActiveObject*> m_active_objects;
        std::vector<ClientSimpleObject*> m_simple_objects;
-       std::list<ClientEnvEvent> m_client_event_queue;
+       std::queue<ClientEnvEvent> m_client_event_queue;
        IntervalLimiter m_active_object_light_update_interval;
        IntervalLimiter m_lava_hurt_interval;
        IntervalLimiter m_drowning_interval;