aboutsummaryrefslogtreecommitdiff
path: root/src/environment.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/environment.h')
-rw-r--r--src/environment.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/environment.h b/src/environment.h
index 0e4b85e06..6c52b003d 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -33,11 +33,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <set>
#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 @@ public:
IBackgroundBlockEmerger *emerger);
~ServerEnvironment();
- Map & getMap()
- { return *m_map; }
+ Map & getMap();
- ServerMap & getServerMap()
- { return *m_map; }
+ ServerMap & getServerMap();
lua_State* getLua()
{ return m_lua; }