Masterserver show privs and js autoload

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 4e7675ecb2a70d7433ac803c34629a450f40779f..b52ae02dcf19b90ebe6a98ef54e33c314d247f9a 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "rollback_interface.h" // Needed for rollbackRevertActions()
 #include "util/numeric.h"
 #include "util/thread.h"
+#include "environment.h"
 #include <string>
 #include <list>
 #include <map>
@@ -487,13 +488,17 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        }
 
        bool showFormspec(const char *name, const std::string &formspec, const std::string &formname);
+       Map & getMap() { return m_env->getMap(); }
+       ServerEnvironment & getEnv() { return *m_env; }
        
        u32 hudAdd(Player *player, HudElement *element);
        bool hudRemove(Player *player, u32 id);
        bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
        bool hudSetFlags(Player *player, u32 flags, u32 mask);
        bool hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount);
-       
+       void hudSetHotbarImage(Player *player, std::string name);
+       void hudSetHotbarSelectedImage(Player *player, std::string name);
+
 private:
 
        // con::PeerHandler implementation.
@@ -680,7 +685,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        JMutex m_con_mutex;
        // Connected clients (behind the con mutex)
        std::map<u16, RemoteClient*> m_clients;
-       u16 m_clients_number; //for announcing masterserver
+       std::vector<std::string> m_clients_names; //for announcing masterserver
 
        // Ban checking
        BanManager *m_banmanager;