Footsteps: Fix offset footstep and shallow water sound bugs

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

diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index 20a783ea54385381f2489ad1396a58238344b9de..b7056c00cd8687ef984debefaed99be8d75a3aeb 100644 (file)
--- a/src/serverenvironment.h
+++ b/src/serverenvironment.h
@@ -21,6 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define SERVER_ENVIRONMENT_HEADER
 
 #include "environment.h"
+#include "mapnode.h"
+#include "mapblock.h"
+#include <set>
 
 class IGameDef;
 class ServerMap;
@@ -29,6 +32,8 @@ class PlayerSAO;
 class ServerEnvironment;
 class ActiveBlockModifier;
 class ServerActiveObject;
+class Server;
+class GameScripting;
 
 /*
        {Active, Loading} block modifier interface.
@@ -190,7 +195,7 @@ class ServerEnvironment : public Environment
 {
 public:
        ServerEnvironment(ServerMap *map, GameScripting *scriptIface,
-               IGameDef *gamedef, const std::string &path_world);
+               Server *server, const std::string &path_world);
        ~ServerEnvironment();
 
        Map & getMap();
@@ -201,8 +206,8 @@ public:
        GameScripting* getScriptIface()
        { return m_script; }
 
-       IGameDef *getGameDef()
-       { return m_gamedef; }
+       Server *getGameDef()
+       { return m_server; }
 
        float getSendRecommendedInterval()
        { return m_recommended_send_interval; }
@@ -377,8 +382,8 @@ private:
        ServerMap *m_map;
        // Lua state
        GameScripting* m_script;
-       // Game definition
-       IGameDef *m_gamedef;
+       // Server definition
+       Server *m_server;
        // World path
        const std::string m_path_world;
        // Active object list