Add disable_jump and fall_damage_add_percent node groups

[dragonfireclient.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index 710b62ee0e62058892c1d7449cce462290ec4f9d..bb1da2461e7baa2c55b28dbe2cce78efd5b24b0e 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -31,13 +31,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <set>
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "player.h"
-#include "map.h"
 #include <ostream>
 #include "activeobject.h"
 #include "util/container.h"
 #include "util/numeric.h"
+#include "mapnode.h"
+#include "mapblock.h"
 
 class Server;
 class ServerEnvironment;
@@ -46,6 +47,8 @@ class ServerActiveObject;
 typedef struct lua_State lua_State;
 class ITextureSource;
 class IGameDef;
+class Map;
+class ServerMap;
 class ClientMap;
 
 class Environment
@@ -191,11 +194,9 @@ class ServerEnvironment : public Environment
                        IBackgroundBlockEmerger *emerger);
        ~ServerEnvironment();
 
-       Map & getMap()
-               { return *m_map; }
+       Map & getMap();
 
-       ServerMap & getServerMap()
-               { return *m_map; }
+       ServerMap & getServerMap();
 
        lua_State* getLua()
                { return m_lua; }
@@ -359,6 +360,7 @@ class ServerEnvironment : public Environment
        IntervalLimiter m_active_blocks_management_interval;
        IntervalLimiter m_active_block_modifier_interval;
        IntervalLimiter m_active_blocks_nodemetadata_interval;
+       int m_active_block_interval_overload_skip;
        // Time from the beginning of the game in seconds.
        // Incremented in step().
        u32 m_game_time;