Translated using Weblate (Japanese)

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

diff --git a/src/environment.h b/src/environment.h
index c9c3744139648d82f07bd85ae1a27d5cc7ce5635..22840a9fcaba7a924c664d0c05779f76aed2d3e8 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -32,13 +32,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <set>
 #include <list>
+#include <queue>
 #include <map>
 #include "irr_v3d.h"
 #include "activeobject.h"
 #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;
 class ActiveBlockModifier;
@@ -125,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;
 
 };
 
@@ -220,6 +222,8 @@ public:
        float getSendRecommendedInterval()
                { return m_recommended_send_interval; }
 
+       void kickAllPlayers(AccessDeniedCode reason,
+               const std::string &str_reason, bool reconnect);
        // Save players
        void saveLoadedPlayers();
        void savePlayer(const std::string &playername);
@@ -305,7 +309,7 @@ public:
        bool swapNode(v3s16 p, const MapNode &n);
 
        // Find all active objects inside a radius around a point
-       std::set<u16> getObjectsInsideRadius(v3f pos, float radius);
+       void getObjectsInsideRadius(std::vector<u16> &objects, v3f pos, float radius);
 
        // Clear all objects, loading and going through every MapBlock
        void clearAllObjects();
@@ -323,6 +327,11 @@ public:
 
        std::set<v3s16>* getForceloadedBlocks() { return &m_active_blocks.m_forceloaded_list; };
 
+       // Sets the static object status all the active objects in the specified block
+       // This is only really needed for deleting blocks from the map
+       void setStaticForActiveObjectsInBlock(v3s16 blockpos,
+               bool static_exists, v3s16 static_block=v3s16(0,0,0));
+
 private:
 
        /*
@@ -378,7 +387,7 @@ private:
        // Active object list
        std::map<u16, ServerActiveObject*> m_active_objects;
        // Outgoing network message buffer for active objects
-       std::list<ActiveObjectMessage> m_active_object_messages;
+       std::queue<ActiveObjectMessage> m_active_object_messages;
        // Some timers
        float m_send_recommended_timer;
        IntervalLimiter m_object_management_interval;
@@ -404,6 +413,8 @@ private:
 #ifndef SERVER
 
 #include "clientobject.h"
+#include "content_cao.h"
+
 class ClientSimpleObject;
 
 /*
@@ -466,6 +477,7 @@ public:
                ActiveObjects
        */
 
+       GenericCAO* getGenericCAO(u16 id);
        ClientActiveObject* getActiveObject(u16 id);
 
        /*
@@ -501,7 +513,7 @@ public:
        // Get event from queue. CEE_NONE is returned if queue is empty.
        ClientEnvEvent getClientEvent();
 
-       u16 m_attachements[USHRT_MAX];
+       u16 attachement_parent_ids[USHRT_MAX + 1];
 
        std::list<std::string> getPlayerNames()
        { return m_player_names; }
@@ -522,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;