New settings tab contain all possible settings

[oweals/minetest.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 6944e56db756c63e754795d2cf391cdc5d9dbb9d..e7f127b84232c892bb1a0492a00d4be9f108778b 100644 (file)
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -38,10 +38,12 @@ const char *ClientInterface::statenames[] = {
        "Disconnecting",
        "Denied",
        "Created",
-       "InitSent",
+       "AwaitingInit2",
+       "HelloSent",
        "InitDone",
        "DefinitionsSent",
-       "Active"
+       "Active",
+       "SudoMode",
 };
 
 
@@ -65,7 +67,7 @@ void RemoteClient::GetNextBlocks (
                float dtime,
                std::vector<PrioritySortedBlockTransfer> &dest)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
 
        // Increment timers
@@ -209,25 +211,19 @@ void RemoteClient::GetNextBlocks (
                                max_simul_dynamic = max_simul_sends_setting;
 
                        // Don't select too many blocks for sending
-                       if(num_blocks_selected >= max_simul_dynamic)
-                       {
+                       if (num_blocks_selected >= max_simul_dynamic) {
                                //queue_is_full = true;
                                goto queue_full_break;
                        }
 
                        // Don't send blocks that are currently being transferred
-                       if(m_blocks_sending.find(p) != m_blocks_sending.end())
+                       if (m_blocks_sending.find(p) != m_blocks_sending.end())
                                continue;
 
                        /*
                                Do not go over-limit
                        */
-                       if(p.X < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.X > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Z < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Z > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE)
+                       if (blockpos_over_limit(p))
                                continue;
 
                        // If this is true, inexistent block will be made from scratch
@@ -239,7 +235,7 @@ void RemoteClient::GetNextBlocks (
                                        generate = false;*/
 
                                // Limit the send area vertically to 1/2
-                               if(abs(p.Y - center.Y) > full_d_max / 2)
+                               if (abs(p.Y - center.Y) > full_d_max / 2)
                                        continue;
                        }
 
@@ -599,7 +595,7 @@ ClientInterface::~ClientInterface()
                Delete clients
        */
        {
-               JMutexAutoLock clientslock(m_clients_mutex);
+               MutexAutoLock clientslock(m_clients_mutex);
 
                for(std::map<u16, RemoteClient*>::iterator
                        i = m_clients.begin();
@@ -615,7 +611,7 @@ ClientInterface::~ClientInterface()
 std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
 {
        std::vector<u16> reply;
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
 
        for(std::map<u16, RemoteClient*>::iterator
                i = m_clients.begin();
@@ -666,7 +662,7 @@ void ClientInterface::UpdatePlayerList()
                        infostream << "* " << player->getName() << "\t";
 
                        {
-                               JMutexAutoLock clientslock(m_clients_mutex);
+                               MutexAutoLock clientslock(m_clients_mutex);
                                RemoteClient* client = lockedGetClientNoEx(*i);
                                if(client != NULL)
                                        client->PrintInfo(infostream);
@@ -686,7 +682,7 @@ void ClientInterface::send(u16 peer_id, u8 channelnum,
 void ClientInterface::sendToAll(u16 channelnum,
                NetworkPacket* pkt, bool reliable)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        for(std::map<u16, RemoteClient*>::iterator
                i = m_clients.begin();
                i != m_clients.end(); ++i) {
@@ -700,7 +696,7 @@ void ClientInterface::sendToAll(u16 channelnum,
 
 RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        std::map<u16, RemoteClient*>::iterator n;
        n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
@@ -731,7 +727,7 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat
 
 ClientState ClientInterface::getClientState(u16 peer_id)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        std::map<u16, RemoteClient*>::iterator n;
        n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
@@ -744,7 +740,7 @@ ClientState ClientInterface::getClientState(u16 peer_id)
 
 void ClientInterface::setPlayerName(u16 peer_id,std::string name)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        std::map<u16, RemoteClient*>::iterator n;
        n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
@@ -755,7 +751,7 @@ void ClientInterface::setPlayerName(u16 peer_id,std::string name)
 
 void ClientInterface::DeleteClient(u16 peer_id)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;
@@ -790,7 +786,7 @@ void ClientInterface::DeleteClient(u16 peer_id)
 
 void ClientInterface::CreateClient(u16 peer_id)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;
@@ -807,7 +803,7 @@ void ClientInterface::CreateClient(u16 peer_id)
 void ClientInterface::event(u16 peer_id, ClientStateEvent event)
 {
        {
-               JMutexAutoLock clientlock(m_clients_mutex);
+               MutexAutoLock clientlock(m_clients_mutex);
 
                // Error check
                std::map<u16, RemoteClient*>::iterator n;
@@ -829,7 +825,7 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event)
 
 u16 ClientInterface::getProtocolVersion(u16 peer_id)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;
@@ -844,7 +840,7 @@ u16 ClientInterface::getProtocolVersion(u16 peer_id)
 
 void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch, std::string full)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;