fixed a small memory leak in game.cpp

[minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index f1c7b6e01cdc1b333b23713ef85dece373caab6f..289f096189020fb8c2ac5c5c0b58b54bfc627578 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -33,6 +33,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include "inventory.h"
 
+/*
+       Some random functions
+*/
+v3f findSpawnPos(ServerMap &map);
+
+/*
+       A structure containing the data needed for queueing the fetching
+       of blocks.
+*/
 struct QueuedBlockEmerge
 {
        v3s16 pos;
@@ -241,6 +250,8 @@ class RemoteClient
                pending_serialization_version = SER_FMT_VER_INVALID;
                m_nearest_unsent_d = 0;
                m_nearest_unsent_reset_timer = 0.0;
+               m_nothing_to_send_counter = 0;
+               m_nothing_to_send_pause_timer = 0;
        }
        ~RemoteClient()
        {
@@ -285,7 +296,7 @@ class RemoteClient
        void PrintInfo(std::ostream &o)
        {
                o<<"RemoteClient "<<peer_id<<": "
-                               <<", m_blocks_sent.size()="<<m_blocks_sent.size()
+                               <<"m_blocks_sent.size()="<<m_blocks_sent.size()
                                <<", m_blocks_sending.size()="<<m_blocks_sending.size()
                                <<", m_nearest_unsent_d="<<m_nearest_unsent_d
                                <<", m_excess_gotblocks="<<m_excess_gotblocks
@@ -341,6 +352,10 @@ class RemoteClient
                This is resetted by PrintInfo()
        */
        u32 m_excess_gotblocks;
+       
+       // CPU usage optimization
+       u32 m_nothing_to_send_counter;
+       float m_nothing_to_send_pause_timer;
 };
 
 class Server : public con::PeerHandler, public MapEventReceiver,
@@ -372,6 +387,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                return time_to_daynight_ratio(m_time_of_day.get());
        }
 
+       void setTimeOfDay(u32 time)
+       {
+               m_time_of_day.set(time);
+               m_time_of_day_send_timer = 0;
+       }
+
        bool getShutdownRequested()
        {
                return m_shutdown_requested.get();
@@ -390,6 +411,19 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        Inventory* getInventory(InventoryContext *c, std::string id);
        void inventoryModified(InventoryContext *c, std::string id);
 
+       // Connection must be locked when called
+       std::wstring getStatusString();
+
+       void requestShutdown(void)
+       {
+               m_shutdown_requested.set(true);
+       }
+
+
+       // Envlock and conlock should be locked when calling this
+       void SendMovePlayer(Player *player);
+
+
 private:
 
        // Virtual methods from con::PeerHandler.
@@ -397,35 +431,58 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
        
+       /*
+               Static send methods
+       */
+       
+       static void SendHP(con::Connection &con, u16 peer_id, u8 hp);
+       static void SendAccessDenied(con::Connection &con, u16 peer_id);
+       
+       /*
+               Non-static send methods
+       */
+
        // Envlock and conlock should be locked when calling these
        void SendObjectData(float dtime);
        void SendPlayerInfos();
        void SendInventory(u16 peer_id);
        void SendChatMessage(u16 peer_id, const std::wstring &message);
        void BroadcastChatMessage(const std::wstring &message);
-       void sendRemoveNode(v3s16 p, u16 ignore_id=0);
-       void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0);
+       void SendPlayerHP(Player *player);
+       /*
+               Send a node removal/addition event to all clients except ignore_id.
+               Additionally, if far_players!=NULL, players further away than
+               far_d_nodes are ignored and their peer_ids are added to far_players
+       */
+       void sendRemoveNode(v3s16 p, u16 ignore_id=0,
+                       core::list<u16> *far_players=NULL, float far_d_nodes=100);
+       void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0,
+                       core::list<u16> *far_players=NULL, float far_d_nodes=100);
        
        // Environment and Connection must be locked when  called
        void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver);
        
        // Sends blocks to clients
        void SendBlocks(float dtime);
+
+       /*
+               Something random
+       */
+       
+       void UpdateCrafting(u16 peer_id);
        
        // When called, connection mutex should be locked
        RemoteClient* getClient(u16 peer_id);
        
-       // Connection must be locked when called
-       std::wstring getStatusString();
-       
        /*
                Get a player from memory or creates one.
                If player is already connected, return NULL
+               The password is not checked here - it is only used to
+               set the password if a new player is created.
 
                Call with env and con locked.
        */
-       Player *emergePlayer(const char *name, const char *password,
-                       u16 peer_id);
+       Player *emergePlayer(const char *name, const char *password, u16 peer_id);
 
        /*
                Update water pressure.