luanti-org · Jan 8, 2017
diff --git a/‎src/CMakeLists.txt
+1 b/‎src/CMakeLists.txt
+1
diff --git a/‎src/clientiface.cpp
+1-1 b/‎src/clientiface.cpp
+1-1
diff --git a/‎src/collision.cpp
+1 b/‎src/collision.cpp
+1
diff --git a/‎src/environment.cpp
-2,149 b/‎src/environment.cpp
-2,149
diff --git a/‎src/environment.h
-397 b/‎src/environment.h
-397
diff --git a/‎src/inventorymanager.cpp
+1-1 b/‎src/inventorymanager.cpp
+1-1
diff --git a/‎src/pathfinder.cpp
+1-1 b/‎src/pathfinder.cpp
+1-1
diff --git a/‎src/script/lua_api/l_env.h
+1-1 b/‎src/script/lua_api/l_env.h
+1-1
diff --git a/‎src/script/lua_api/l_nodemeta.cpp
+1-1 b/‎src/script/lua_api/l_nodemeta.cpp
+1-1
diff --git a/‎src/script/lua_api/l_nodetimer.cpp
+1-1 b/‎src/script/lua_api/l_nodetimer.cpp
+1-1
diff --git a/‎src/server.h
+1-1 b/‎src/server.h
+1-1
diff --git a/‎src/serverenvironment.cpp
+2,167 b/‎src/serverenvironment.cpp
+2,167
diff --git a/‎src/serverenvironment.h
+423 b/‎src/serverenvironment.h
+423
diff --git a/‎src/treegen.cpp
+1-2 b/‎src/treegen.cpp
+1-2
@@ -452,6 +452,7 @@ set(common_SRCS
 	rollback_interface.cpp
 	serialization.cpp
 	server.cpp
+	serverenvironment.cpp
 	serverlist.cpp
 	serverobject.cpp
 	settings.cpp
 
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "mapblock.h"
 #include "network/connection.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "map.h"
 #include "emerge.h"
 #include "content_sao.h"              // TODO this is used for cleanup of only
 
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "gamedef.h"
 #include "clientenvironment.h"
+#include "serverenvironment.h"
 #include "serverobject.h"
 #include "profiler.h"
 
 
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "inventorymanager.h"
 #include "log.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "scripting_game.h"
 #include "serverobject.h"
 #include "settings.h"
 
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /******************************************************************************/
 
 #include "pathfinder.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "gamedef.h"
 #include "nodedef.h"
 #include "map.h"
 
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define L_ENV_H_
 
 #include "lua_api/l_base.h"
-#include "environment.h"
+#include "serverenvironment.h"
 
 class ModApiEnvMod : public ModApiBase {
 private:
 
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_inventory.h"
 #include "common/c_converter.h"
 #include "common/c_content.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "map.h"
 #include "gamedef.h"
 #include "nodemetadata.h"
 
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "lua_api/l_nodetimer.h"
 #include "lua_api/l_internal.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "map.h"
 
 
 
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "util/thread.h"
 #include "util/basic_macros.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "chat_interface.h"
 #include "clientiface.h"
 #include "remoteplayer.h"
 
@@ -21,9 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <stack>
 #include "util/pointer.h"
 #include "util/numeric.h"
-#include "util/mathconstants.h"
 #include "map.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "nodedef.h"
 #include "treegen.h"