Schematics: Fix core.schematic_create()

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index f62b5b66070a6a03c1fde915371929efa4bd16ff..ba993523b8f95ff7c9e88a979adf949e70017479 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -63,11 +63,6 @@ enum ClientDeletionReason {
        CDR_DENY
 };
 
-/*
-       Some random functions
-*/
-v3f findSpawnPos(ServerMap &map);
-
 class MapEditEventIgnorer
 {
 public:
@@ -219,7 +214,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void handleCommand_NodeMetaFields(NetworkPacket* pkt);
        void handleCommand_InventoryFields(NetworkPacket* pkt);
 
-       void ProcessData(u8 *data, u32 datasize, u16 peer_id);
+       void ProcessData(NetworkPacket *pkt);
 
        void Send(NetworkPacket* pkt);
 
@@ -237,7 +232,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                Shall be called with the environment and the connection locked.
        */
        Inventory* getInventory(const InventoryLocation &loc);
-       void setInventoryModified(const InventoryLocation &loc);
+       void setInventoryModified(const InventoryLocation &loc, bool playerSend = true);
 
        // Connection must be locked when called
        std::wstring getStatusString();
@@ -302,9 +297,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Envlock and conlock should be locked when using scriptapi
        GameScripting *getScriptIface(){ return m_script; }
 
-       //TODO: determine what (if anything) should be locked to access EmergeManager
-       EmergeManager *getEmergeManager(){ return m_emerge; }
-
        // actions: time-reversed list
        // Return value: success/failure
        bool rollbackRevertActions(const std::list<RollbackAction> &actions,
@@ -322,7 +314,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        virtual MtEventManager* getEventManager();
        virtual scene::ISceneManager* getSceneManager();
        virtual IRollbackManager *getRollbackManager() { return m_rollback; }
-
+       virtual EmergeManager *getEmergeManager() { return m_emerge; }
 
        IWritableItemDefManager* getWritableItemDefManager();
        IWritableNodeDefManager* getWritableNodeDefManager();
@@ -474,6 +466,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void DeleteClient(u16 peer_id, ClientDeletionReason reason);
        void UpdateCrafting(Player *player);
 
+       v3f findSpawnPos();
+
        // When called, connection mutex should be locked
        RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
        RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);